From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Sylwester Nawrocki <snjw23@gmail.com>
Cc: "linux-media@vger.kernel.org" <linux-media@vger.kernel.org>,
Sylwester Nawrocki <s.nawrocki@samsung.com>
Subject: Re: [GIT PULL FOR 3.5] s5p-fimc driver updates
Date: Sun, 20 May 2012 09:39:36 -0300 [thread overview]
Message-ID: <4FB8E608.108@redhat.com> (raw)
In-Reply-To: <4FB17B79.2000207@gmail.com>
Em 14-05-2012 18:39, Sylwester Nawrocki escreveu:
> On 05/10/2012 10:48 AM, Sylwester Nawrocki wrote:
>> On 05/04/2012 05:31 PM, Sylwester Nawrocki wrote:
>>> Hi Mauro,
>>>
>>> The following changes since commit 34b2debaa62bfa384ef91b61cf2c40c48e86a5e2:
>>>
>>> s5p-fimc: Correct memory allocation for VIDIOC_CREATE_BUFS (2012-05-04 17:07:24 +0200)
>>>
>>> are available in the git repository at:
>>>
>>> git://git.infradead.org/users/kmpark/linux-samsung v4l-fimc-exynos4x12
>>>
>>> for you to fetch changes up to bab96b068afa07105139be09d3830cc9ed580382:
>>>
>>> s5p-fimc: Use selection API in place of crop operations (2012-05-04 17:18:38 +0200)
>>
>> Mauro,
>>
>> I've found a few issues in this series afterwards and re-edited 3 commits there.
>> Here is an updated pull request:
>>
>> The following changes since commit ae45d3e9aea0ab951dbbca2238fbfbf3993f1e7f:
>>
>> s5p-fimc: Correct memory allocation for VIDIOC_CREATE_BUFS (2012-05-09 16:07:49 +0200)
>>
>> are available in the git repository at:
>>
>> git://git.infradead.org/users/kmpark/linux-samsung v4l-fimc-exynos4x12
>>
>> for you to fetch changes up to 5feefe6656583de6fd4ef1d53b19031dd5efeec1:
>>
>> s5p-fimc: Use selection API in place of crop operations (2012-05-09 16:11:29 +0200)
>>
>> ----------------------------------------------------------------
>> Sylwester Nawrocki (14):
>> V4L: Extend V4L2_CID_COLORFX with more image effects
>> s5p-fimc: Avoid crash with null platform_data
>> s5p-fimc: Move m2m node driver into separate file
>
> It seems there is a conflict now with this patch:
> http://git.linuxtv.org/media_tree.git/commit/5126f2590bee412e3053de851cb07f531e4be36a
>
> Attached are updated versions of the two conflicting patches, the others
> don't need touching.
>
> I could provide rebased version of the whole change set tomorrow - if needed.
Please do that, as this patch doesn't apply as-is.
Regards,
Mauro
$ quilt push
Applying patch patches/lmml_11243_git_pull_for_3_5_s5p_fimc_driver_updates.patch
patching file drivers/media/video/s5p-fimc/fimc-capture.c
Hunk #1 FAILED at 993.
Hunk #2 FAILED at 1489.
Hunk #3 FAILED at 1554.
Hunk #4 FAILED at 1572.
Hunk #5 FAILED at 1580.
Hunk #6 FAILED at 1616.
Hunk #7 FAILED at 1636.
7 out of 7 hunks FAILED -- rejects in file drivers/media/video/s5p-fimc/fimc-capture.c
patching file drivers/media/video/s5p-fimc/fimc-core.c
Hunk #1 FAILED at 842.
Hunk #2 FAILED at 851.
Hunk #3 FAILED at 866.
Hunk #4 FAILED at 953.
4 out of 4 hunks FAILED -- rejects in file drivers/media/video/s5p-fimc/fimc-core.c
patching file drivers/media/video/s5p-fimc/fimc-core.h
Hunk #1 FAILED at 331.
Hunk #2 FAILED at 737.
2 out of 2 hunks FAILED -- rejects in file drivers/media/video/s5p-fimc/fimc-core.h
patching file drivers/media/video/s5p-fimc/fimc-m2m.c
Hunk #1 FAILED at 777.
Hunk #2 FAILED at 789.
2 out of 2 hunks FAILED -- rejects in file drivers/media/video/s5p-fimc/fimc-m2m.c
patching file drivers/media/video/s5p-fimc/fimc-mdevice.c
Hunk #1 FAILED at 304.
Hunk #2 FAILED at 313.
Hunk #3 FAILED at 401.
Hunk #4 FAILED at 420.
Hunk #5 FAILED at 479.
Hunk #6 FAILED at 588.
Hunk #7 FAILED at 817.
7 out of 7 hunks FAILED -- rejects in file drivers/media/video/s5p-fimc/fimc-mdevice.c
patching file drivers/media/video/s5p-fimc/fimc-mdevice.h
Hunk #1 FAILED at 24.
1 out of 1 hunk FAILED -- rejects in file drivers/media/video/s5p-fimc/fimc-mdevice.h
next prev parent reply other threads:[~2012-05-20 12:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-04 15:31 [GIT PULL FOR 3.5] s5p-fimc driver updates Sylwester Nawrocki
2012-05-10 8:48 ` Sylwester Nawrocki
2012-05-14 21:39 ` Sylwester Nawrocki
2012-05-15 15:41 ` Sylwester Nawrocki
2012-05-20 12:39 ` Mauro Carvalho Chehab [this message]
2012-05-20 14:05 ` Sylwester Nawrocki
2012-05-20 15:30 ` Mauro Carvalho Chehab
2012-05-20 17:33 ` Sylwester Nawrocki
2012-05-14 13:04 ` Mauro Carvalho Chehab
2012-05-14 13:08 ` Mauro Carvalho Chehab
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=4FB8E608.108@redhat.com \
--to=mchehab@redhat.com \
--cc=linux-media@vger.kernel.org \
--cc=s.nawrocki@samsung.com \
--cc=snjw23@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.