On 08/12/17 23:48, Steve Longerbeam wrote: > > > On 12/08/2017 08:38 AM, Mauro Carvalho Chehab wrote: >> Em Fri, 8 Dec 2017 11:56:58 +0100 >> Hans Verkuil <hverkuil@xxxxxxxxx> escreveu: >> >>> Note: the new v4l2-async work makes it possible to simplify this. That >>> will be done in follow-up patches. It's easier to do that if this is in >>> first. >>> >>> Regards, >>> >>> Hans >>> >>> The following changes since commit 781b045baefdabf7e0bc9f33672ca830d3db9f27: >>> >>> media: imx274: Fix error handling, add MAINTAINERS entry (2017-11-30 04:45:12 -0500) >>> >>> are available in the git repository at: >>> >>> git://linuxtv.org/hverkuil/media_tree.git imx >>> >>> for you to fetch changes up to 82737cbb02f269b8eb608c7bd906a79072f6adad: >>> >>> media: staging/imx: update TODO (2017-12-04 14:05:19 +0100) >>> >>> ---------------------------------------------------------------- >>> Steve Longerbeam (9): >>> media: staging/imx: get CSI bus type from nearest upstream entity >> There are some non-trivial conflicts on this patch. >> Care to rebase it? > > Attached is fixed-up version. That still doesn't apply against the latest media_tree master. Regards, Hans
