[linux-yocto] [PATCH] LSI AXXIA updates to 3.4 standard/axxia/base

[Cristian Bercaru]

Hello, Bruce!

Sorry for the duplicate mails. I had some trouble with my Internet 
connection and I resent the patch.

I can apply this patch just fine on 'standard/axxia/base' of a freshly 
cloned linux-yocto-3.4:
arch/powerpc/kernel: Address IBM PPC476 erratum 48 (update)

I think you tried to apply another patch that you already applied.
Please check you mailbox again.

 > yow-bashfiel-d4 [/home/bruc....git-merge]> git am -s a.mbox
 > Applying: arch/powerpc/kernel: Address IBM PPC476 erratum 47

Thanks,
Cristian

On 03/30/2015 09:39 PM, Bruce Ashfield wrote:
> On 2015-03-30 01:10 PM, cristian.bercaru at windriver.com wrote:
>> From: Cristian Bercaru <cristian.bercaru at windriver.com>
>>
>> Hello! This patch is an update to IBM PPC476 erratum 48 fix and it is
>> tagged with the latest 3.4 tag: lsi_axxia_linux_7.8.1.43.
>
> This came through multiple times .. is this the right version ? This
> patch won't apply to the linux-yocto-3.4 standard/axxxia/base branch:
>
> yow-bashfiel-d4 [/home/bruc....git-merge]> git am -s a.mbox
> Applying: arch/powerpc/kernel: Address IBM PPC476 erratum 47
> error: patch failed: arch/powerpc/kernel/head_44x.S:1249
> error: arch/powerpc/kernel/head_44x.S: patch does not apply
> Patch failed at 0001 arch/powerpc/kernel: Address IBM PPC476 erratum 47
> The copy of the patch that failed is found in:
>
> /home/bruce/poky-kernel/linux-yocto-3.4.git-merge/.git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> Bruce
>
>>
>> Sangeetha Rao (1):
>>    arch/powerpc/kernel: Address IBM PPC476 erratum 48 (update)
>>
>>   arch/powerpc/kernel/traps.c |    6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>
>