Re: [GIT PULL FOR 6.8] V4L2 subdev patches

[Laurent Pinchart <laurent.pinchart@ideasonboard.com>]

On Wed, Nov 22, 2023 at 11:00:19AM +0100, Hans Verkuil wrote:
> On 17/11/2023 14:16, Sakari Ailus wrote:
> > Hi Mauro, Hans,
> > 
> > I've split the large PR into two smaller ones, this only contains
> > relatively unimportant fixes and cleanups mainly for the recenlty merged
> > IVSC driver, but also one for the CCS driver as well as an indentation fix
> > for the v4l2-subdev.h header.
> > 
> > Please pull.
> > 
> > 
> > The following changes since commit 1865913dd590ca6d5e3207b15099a1210dd62f29:
> > 
> >   media: meson-ir-tx: Drop usage of platform_driver_probe() (2023-11-16 13:56:48 +0100)
> > 
> > are available in the Git repository at:
> > 
> >   git://linuxtv.org/sailus/media_tree.git tags/for-6.8-3-signed
> > 
> > for you to fetch changes up to 27b4ca9ef301b2475d4a72d2a8c264ebe7f91482:
> > 
> >   media: ivsc: csi: Check number of lanes on source, too (2023-11-17 09:41:52 +0200)
> > 
> > ----------------------------------------------------------------
> > V4L2 patches for 6.8
> > 
> > ----------------------------------------------------------------
> > Laurent Pinchart (1):
> >       media: v4l2-subdev: Fix indentation in v4l2-subdev.h
> 
> I am skipping this patch: it will clash with this fix for v6.7:
> 
> https://patchwork.linuxtv.org/project/linux-media/patch/b9b0c0c8-6ece-466a-99e4-d49797f69957@moroto.mountain/
> 
> Once this is merged back into our tree it can be applied again.

It's no big deal in this case, but in general, why would we need to skip
when there's a merge conflict ? You can simply resolve the merge
conflict when merging.

> Too bad this wasn't corrected in the v6.7 fix, that would have been
> nice.
> 
> > Sakari Ailus (7):
> >       media: ccs: Ensure control handlers have been set up after probe
> >       media: ivsc: csi: Don't parse remote endpoints
> >       media: ivsc: csi: Clean up V4L2 async notifier on error
> >       media: ivsc: csi: Clean up notifier set-up
> >       media: ivsc: csi: Clean up parsing firmware and setting up async notifier
> >       media: ivsc: csi: Don't mask v4l2_fwnode_endpoint_parse return value
> >       media: ivsc: csi: Check number of lanes on source, too
> > 
> >  drivers/media/i2c/ccs/ccs-core.c       |  5 ++-
> >  drivers/media/i2c/ccs/ccs.h            |  1 +
> >  drivers/media/pci/intel/ivsc/mei_csi.c | 69 ++++++++++++++++++++++------------
> >  include/uapi/linux/v4l2-subdev.h       |  2 +-
> >  4 files changed, 50 insertions(+), 27 deletions(-)

-- 
Regards,

Laurent Pinchart