On Wed, Jun 19, 2013 at 02:11:53PM +0800, Gavin Shan wrote: >On Wed, Jun 19, 2013 at 01:58:06PM +1000, Michael Neuling wrote: >>Bunch of whitespace issues here: >> >>% git am ~/Mail/linuxppc/31202 >>Applying: powerpc/eeh: Move common part to kernel directory >>/home/mikey/src/powerpc-test/.git/rebase-apply/patch:437: trailing whitespace. >> >>/home/mikey/src/powerpc-test/.git/rebase-apply/patch:594: space before tab in >>indent. >> */ >>/home/mikey/src/powerpc-test/.git/rebase-apply/patch:607: trailing whitespace. >> >>/home/mikey/src/powerpc-test/.git/rebase-apply/patch:608: trailing whitespace. >> /* We might get hit with another EEH freeze as soon as the >>/home/mikey/src/powerpc-test/.git/rebase-apply/patch:673: trailing whitespace. >> >>error: patch failed: arch/powerpc/platforms/pseries/eeh_pe.c:1 >>error: arch/powerpc/platforms/pseries/eeh_pe.c: patch does not apply >>Patch failed at 0001 powerpc/eeh: Move common part to kernel directory >>When you have resolved this problem run "git am --resolved". >>If you would prefer to skip this patch, instead run "git am --skip". >>To restore the original branch and stop patching run "git am --abort". >> > >Sorry for the inconvenience, Mikey. Please apply the updated [01/31] and >[02/31] in >the attachment. The left patches except [17/31] are not changed. The updated >[17/31] >will be contained in the attachment of the corresponding thread (original >message >about [17/31]). Something like: >
Sorry, it's updated [14/31] instead of updated [17/31]. updated [01/31] updated [02/31] [03/31] [04/31] : : updated [14/31] (not updated [14/31]) [18/31] [19/31] : : [31/31] Thanks, Gavin _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
