[RESEND PATCH 4/14] staging/media/as102: checkpatch fixes

Piotr Chmura chmooreck at poczta.onet.pl
Sat Oct 29 17:48:07 UTC 2011



W dniu 29.10.2011 18:14, Sylwester Nawrocki pisze:
> Hi,
>
> On 10/29/2011 03:17 PM, Piotr Chmura wrote:
>> W dniu 29.10.2011 12:22, Sylwester Nawrocki pisze:
>>> On 10/18/2011 09:51 PM, Piotr Chmura wrote:
>>>> Patch taken from http://kernellabs.com/hg/~dheitmueller/v4l-dvb-as102-2/
>>>>
>>>> Original source and comment:
>>>> # HG changeset patch
>>>> # User Devin Heitmueller<dheitmueller at kernellabs.com>
>>>> # Date 1267318701 18000
>>>> # Node ID 69c8f5172790784738bcc18f8301919ef3d5373f
>>>> # Parent b91e96a07bee27c1d421b4c3702e33ee8075de83
>>>> as102: checkpatch fixes
>>>>
>>>> From: Devin Heitmueller<dheitmueller at kernellabs.com>
>>>>
>>>> Fix make checkpatch issues reported against as10x_cmd.c.
>>>>
>>>> Priority: normal
>>>>
>>>> Signed-off-by: Devin Heitmueller<dheitmueller at kernellabs.com>
>>>> Signed-off-by: Piotr Chmura<chmooreck at poczta.onet.pl>
>>> Hi Piotr,
>>>
>>> starting from this patch the series doesn't apply cleanly to
>>> staging/for_v3.2 tree. Which branch is it based on ?
>>>
>>> ---
>>> Thanks,
>>> Sylwester
>> Hi Sylwester,
>>
>> I'is based on
>> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git kernel-3.1.0-git9+
>>
>> All patches are working on newly created driver directory drivers/staging/media/as102
>> (exception is 13/14: staging/Makefile and staging/Kconfig) and they apply cleanly in
>> my tree. Let me know why they doesn't on yours and i'll try to fix them.
> I suspect the patch got mangled. The base tree shouldn't matter that much since
> the patches are touching only the newly created directory.
> With you previous patch set I'm getting an error at patch 5/11.
>
>
> snawrocki at vostro:~/linux/media_tree$ git am -3 RESEND-1-14-staging-media-as102-initial-import-from-Abilis.patch
> Applying: staging/media/as102: initial import from Abilis
> snawrocki at vostro:~/linux/media_tree$ git am -3 RESEND-2-14-staging-media-as102-checkpatch-fixes.patch
> Applying: staging/media/as102: checkpatch fixes
> snawrocki at vostro:~/linux/media_tree$ git am -3 RESEND-3-14-staging-media-as102-checkpatch-fixes.patch
> Applying: staging/media/as102: checkpatch fixes
> snawrocki at vostro:~/linux/media_tree$ git am -3 RESEND-4-14-staging-media-as102-checkpatch-fixes.patch
> Applying: staging/media/as102: checkpatch fixes
> fatal: corrupt patch at line 664
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 staging/media/as102: checkpatch fixes
> 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".
I've downloaded patches from patchwork, as expected by you:

dom at darkstar ~/src/kernel/linux.trynew $ patch -p1 -i 
RESEND-4-14-staging-media-as102-checkpatch-fixes.patch
patching file drivers/staging/media/as102/as10x_cmd.c
patch: **** malformed patch at line 664: To unsubscribe from this list: 
send the line "unsubscribe linux-media" in

after removing
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo at vger.kernel.org
from end of file:

dom at darkstar ~/src/kernel/linux.trynew $ patch -p1 -i 
RESEND-4-14-staging-media-as102-checkpatch-fixes.patch
patching file drivers/staging/media/as102/as10x_cmd.c

Works fine, so looks like footer of mailing list IS an issue here (there 
are less then 3 lines in patch because of end of file).

> snawrocki at vostro:~/linux/media_tree$ git apply --verbose --reject RESEND-4-14-staging-media-as102-checkpatch-fixes.patch
> fatal: corrupt patch at line 702
> snawrocki at vostro:~/linux/media_tree$ git ll
> cbcbb4b staging/media/as102: checkpatch fixes
> acde12d staging/media/as102: checkpatch fixes
> d47fc51 staging/media/as102: initial import from Abilis
> ...
>
> You are not using git send-email to send the patches, are you ?
>
I'm not using git for sending patches.

Peter



More information about the devel mailing list