Mauro,

Kevin is going to merge the arch part #67669 as we did last time.
Please merge only the v4l2 part. I have copied Kevin in this email.

Murali Karicheri
Software Design Engineer
Texas Instruments Inc.
Germantown, MD 20874
phone: 301-407-9583
email: m-kariche...@ti.com

>-----Original Message-----
>From: Mauro Carvalho Chehab [mailto:mche...@infradead.org]
>Sent: Thursday, December 17, 2009 6:18 AM
>To: Hans Verkuil
>Cc: linux-media@vger.kernel.org; Karicheri, Muralidharan
>Subject: Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-davinci
>
>Hans Verkuil wrote:
>> Hi Mauro,
>>
>> Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-davinci for
>the following:
>>
>> - v4l: vpfe_capture: remove clock and ccdc resource handling
>> - v4l: vpfe capture: convert dm355 ccdc driver to a platform driver
>> - v4l: vpfe capture: convert dm644x ccdc module to a platform driver
>>
>> And after these three patches are pulled in, then this arch patch should
>also be
>> merged for git:
>>
>> http://patchwork.kernel.org/patch/67669/
>
>Hmm... It seems that git bisect will break if I merge first the conversion
>and then
>the platform_data patches.
>
>Also, we had some bad merge dependency troubles last time I merged an arch
>patch
>on my tree, as those omap arch header files are highly volatile. I bet that,
>if I
>merge the patch #67669 on my tree it will cause conflicts when I send it
>during
>the next merge window (and it is too late for sending those patches to
>linux-next,
>wait for a couple days and send upstream before -rc1).
>
>Cheers,
>Mauro.
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to