From: Sylwester Nawrocki <snjw23@gmail.com>
To: Piotr Chmura <chmooreck@poczta.onet.pl>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>,
Devin Heitmueller <dheitmueller@kernellabs.com>,
Stefan Richter <stefanr@s5r6.in-berlin.de>,
Greg KH <gregkh@suse.de>, Patrick Dickey <pdickeybeta@gmail.com>,
LMML <linux-media@vger.kernel.org>,
devel@driverdev.osuosl.org
Subject: Re: [RESEND PATCH 4/14] staging/media/as102: checkpatch fixes
Date: Sat, 29 Oct 2011 18:14:46 +0200 [thread overview]
Message-ID: <4EAC2676.8030808@gmail.com> (raw)
In-Reply-To: <4EABFCF8.2010003@poczta.onet.pl>
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@kernellabs.com>
>>> # Date 1267318701 18000
>>> # Node ID 69c8f5172790784738bcc18f8301919ef3d5373f
>>> # Parent b91e96a07bee27c1d421b4c3702e33ee8075de83
>>> as102: checkpatch fixes
>>>
>>> From: Devin Heitmueller<dheitmueller@kernellabs.com>
>>>
>>> Fix make checkpatch issues reported against as10x_cmd.c.
>>>
>>> Priority: normal
>>>
>>> Signed-off-by: Devin Heitmueller<dheitmueller@kernellabs.com>
>>> Signed-off-by: Piotr Chmura<chmooreck@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@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@vostro:~/linux/media_tree$ git am -3 RESEND-2-14-staging-media-as102-checkpatch-fixes.patch
Applying: staging/media/as102: checkpatch fixes
snawrocki@vostro:~/linux/media_tree$ git am -3 RESEND-3-14-staging-media-as102-checkpatch-fixes.patch
Applying: staging/media/as102: checkpatch fixes
snawrocki@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".
snawrocki@vostro:~/linux/media_tree$ git apply --verbose --reject RESEND-4-14-staging-media-as102-checkpatch-fixes.patch
fatal: corrupt patch at line 702
snawrocki@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 ?
--
Regards,
Sylwester
next prev parent reply other threads:[~2011-10-29 16:15 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-25 12:33 Problems cloning the git repostories Patrick Dickey
2011-09-25 13:55 ` Devin Heitmueller
2011-09-26 3:25 ` Mauro Carvalho Chehab
2011-09-27 2:20 ` Devin Heitmueller
2011-09-27 7:44 ` Staging submission: PCTV 80e and PCTV 74e drivers (was Re: Problems cloning the git repostories) Stefan Richter
2011-09-27 17:43 ` Greg KH
2011-09-27 19:33 ` Stefan Richter
2011-10-15 20:54 ` [PATCH 0/7] Staging submission: PCTV 74e drivers and some cleanup (was: Staging submission: PCTV 80e and PCTV 74e drivers) Piotr Chmura
2011-10-17 22:31 ` Greg KH
2011-10-19 12:36 ` Staging questions: WAS Re: [PATCH 0/7] Staging submission: PCTV 74e drivers and some cleanup Patrick Dickey
2011-10-19 13:57 ` Devin Heitmueller
2011-10-20 3:44 ` Mauro Carvalho Chehab
2011-10-20 10:53 ` Patrick Dickey
2011-10-20 11:22 ` Mauro Carvalho Chehab
[not found] ` <4E9992F9.7000101@poczta.onet.pl>
2011-10-15 20:54 ` [PATCH 2/7] staging/as102: add new device nBox DVB-T Dongle Piotr Chmura
2011-10-15 20:54 ` [PATCH 3/7] staging/as102: cleanup - get rid of typedefs Piotr Chmura
2011-10-15 20:54 ` [PATCH 4/7] staging/as102: cleanup - formatting code Piotr Chmura
2011-10-16 12:23 ` Julian Andres Klode
2011-10-16 12:40 ` Devin Heitmueller
2011-10-16 21:53 ` Dan Carpenter
2011-10-15 20:54 ` [PATCH 5/7] staging as102: cleanup - get rid of pragma(pack) Piotr Chmura
[not found] ` <4E999733.2010802@poczta.onet.pl>
2011-10-15 20:54 ` [PATCH 1/7] Staging submission: PCTV 74e driver (as102) Piotr Chmura
2011-10-16 8:57 ` Stefan Richter
2011-10-16 11:45 ` Devin Heitmueller
2011-10-16 13:44 ` Mauro Carvalho Chehab
2011-10-18 9:10 ` [PATCH 0/14] staging/media/as102: new driver submission (was " Piotr Chmura
2011-10-18 15:52 ` Devin Heitmueller
2011-10-18 17:20 ` Piotr Chmura
2011-10-19 11:41 ` Javier Martinez Canillas
2011-10-19 11:44 ` Mauro Carvalho Chehab
2011-10-19 13:07 ` Piotr Chmura
[not found] ` <20111018094647.d4982eb2.chmooreck@poczta.onet.pl>
2011-10-18 9:11 ` [PATCH 1/14] staging/media/as102: initial import from Abilis Piotr Chmura
2011-10-18 16:24 ` Dan Carpenter
2011-10-18 16:38 ` Mauro Carvalho Chehab
2011-10-18 22:33 ` Dan Carpenter
2011-10-18 19:46 ` [RESEND PATCH " Piotr Chmura
2011-10-30 21:03 ` Piotr Chmura
2011-10-30 21:25 ` Stefan Richter
2011-10-31 10:24 ` Sylwester Nawrocki
2011-10-18 9:11 ` [PATCH 2/14] staging/media/as102: checkpatch fixes Piotr Chmura
2011-10-18 19:48 ` [RESEND PATCH " Piotr Chmura
2011-10-18 9:11 ` [PATCH 3/14] " Piotr Chmura
2011-10-18 19:50 ` [RESEND PATCH " Piotr Chmura
2011-10-18 9:11 ` [PATCH 4/14] " Piotr Chmura
2011-10-18 19:51 ` [RESEND PATCH " Piotr Chmura
2011-10-29 10:22 ` Sylwester Nawrocki
2011-10-29 13:17 ` Piotr Chmura
2011-10-29 16:14 ` Sylwester Nawrocki [this message]
2011-10-29 17:48 ` Piotr Chmura
2011-10-29 21:37 ` Sylwester Nawrocki
2011-10-30 7:11 ` [PATCH v3 " Piotr Chmura
2011-10-30 11:17 ` Stefan Richter
2011-10-31 10:48 ` Stefan Richter
2011-10-31 11:47 ` Mauro Carvalho Chehab
2011-10-29 16:25 ` [RESEND PATCH " Piotr Chmura
2011-10-29 16:39 ` Sylwester Nawrocki
2011-10-29 17:00 ` Dan Carpenter
2011-10-18 9:11 ` [PATCH 5/14] " Piotr Chmura
2011-10-18 19:54 ` [RESEND PATCH " Piotr Chmura
2011-10-30 13:53 ` [PATCH v3 " Piotr Chmura
2011-10-18 9:12 ` [PATCH 6/14] " Piotr Chmura
2011-10-18 19:56 ` [RESEND PATCH " Piotr Chmura
2011-10-18 9:12 ` [PATCH 7/14] " Piotr Chmura
2011-10-18 19:57 ` [RESEND PATCH " Piotr Chmura
2011-10-18 9:12 ` [PATCH 8/14] " Piotr Chmura
2011-10-18 19:58 ` [RESEND PATCH " Piotr Chmura
2011-10-18 9:12 ` [PATCH 9/14] staging/media/as102: Add Elgato EyeTV DTT Deluxe Piotr Chmura
2011-10-18 19:59 ` [RESEND PATCH " Piotr Chmura
2011-10-18 9:12 ` [PATCH 10/14] staging/media/as102: properly handle multiple product names Piotr Chmura
2011-10-18 20:02 ` [RESEND PATCH " Piotr Chmura
2011-10-18 20:28 ` Joe Perches
2011-10-18 20:54 ` Piotr Chmura
2011-10-18 20:56 ` Greg KH
2011-10-18 20:58 ` Joe Perches
2011-10-18 9:13 ` [PATCH 11/14] staging/media/as102: fix compile warning about unused function Piotr Chmura
2011-10-18 20:03 ` [RESEND PATCH " Piotr Chmura
2011-10-30 20:04 ` Sylwester Nawrocki
2011-10-30 21:15 ` Stefan Richter
2011-10-18 9:13 ` [PATCH 12/14] staging/media/as102: fix licensing oversight Piotr Chmura
2011-10-18 20:05 ` [RESEND PATCH " Piotr Chmura
2011-10-18 9:13 ` [PATCH 13/14] staging/media/as102: fix compile Piotr Chmura
2011-10-18 9:13 ` [PATCH 14/14] staging/media/as102: add nBox Tuner Dongle support Piotr Chmura
2011-10-15 20:55 ` [PATCH 6/7] staging/as102: cleanup - get rid of editor comments Piotr Chmura
2011-10-15 20:55 ` [PATCH 7/7] staging/as102: cleanup - get rid unnecessary LINUX and WIN32 defines Piotr Chmura
2011-10-30 21:09 ` Problems cloning the git repostories Marek Vasut
2011-09-25 14:53 ` Anca Emanuel
2011-09-25 18:03 ` Johannes Stezenbach
2011-09-26 2:56 ` Mauro Carvalho Chehab
2011-09-26 10:15 ` Scott Jiang
2011-09-26 19:24 ` Johannes Stezenbach
2011-09-26 11:27 ` Patrick Dickey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EAC2676.8030808@gmail.com \
--to=snjw23@gmail.com \
--cc=chmooreck@poczta.onet.pl \
--cc=devel@driverdev.osuosl.org \
--cc=dheitmueller@kernellabs.com \
--cc=gregkh@suse.de \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=pdickeybeta@gmail.com \
--cc=stefanr@s5r6.in-berlin.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).