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.

Kind regards,
Sylwester

>        s5p-fimc: Use v4l2_subdev internal ops to register video nodes
>        s5p-fimc: Refactor the register interface functions
>        s5p-fimc: Add FIMC-LITE register definitions
>        s5p-fimc: Rework the video pipeline control functions
>        s5p-fimc: Prefix format enumerations with FIMC_FMT_
>        s5p-fimc: Minor cleanups
>        s5p-fimc: Make sure an interrupt is properly requested
>        s5p-fimc: Add support for Exynos4x12 FIMC-LITE
>        s5p-fimc: Update copyright notices
>        s5p-fimc: Add color effect control
>        s5p-fimc: Use selection API in place of crop operations