Hi all,

Today's linux-next merge of the v4l-dvb tree got a conflict in:

  drivers/media/platform/qcom/iris/iris_vdec.c

between commit:

  3d9593ad1a58c ("media: iris: fix use-after-free of fmt_src during MBPF check")

from the origin tree and commits:

  65c06d2edded3 ("media: qcom: iris: vdec: allow GEN2 decoding into 10bit format")
  56f93da11a7c3 ("media: iris: drop struct iris_fmt")

from the v4l-dvb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/media/platform/qcom/iris/iris_vdec.c
index 99d544e2af4f9,a8d6354bee28f..0000000000000
--- a/drivers/media/platform/qcom/iris/iris_vdec.c
+++ b/drivers/media/platform/qcom/iris/iris_vdec.c
@@@ -61,23 -62,24 +62,18 @@@ int iris_vdec_inst_init(struct iris_ins
  	return iris_ctrls_init(inst);
  }
  
- static const struct iris_fmt iris_vdec_formats_cap[] = {
- 	[IRIS_FMT_NV12] = {
- 		.pixfmt = V4L2_PIX_FMT_NV12,
- 		.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
- 	},
- 	[IRIS_FMT_QC08C] = {
- 		.pixfmt = V4L2_PIX_FMT_QC08C,
- 		.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
- 	},
 -void iris_vdec_inst_deinit(struct iris_inst *inst)
 -{
 -	kfree(inst->fmt_dst);
 -	kfree(inst->fmt_src);
 -}
 -
+ static const u32 iris_vdec_formats_cap[] = {
+ 	[IRIS_FMT_NV12] = V4L2_PIX_FMT_NV12,
+ 	[IRIS_FMT_QC08C] = V4L2_PIX_FMT_QC08C,
+ 	[IRIS_FMT_TP10] =  V4L2_PIX_FMT_P010,
+ 	[IRIS_FMT_QC10C] =  V4L2_PIX_FMT_QC10C,
  };
  
- static const struct iris_fmt *
- find_format(struct iris_inst *inst, u32 pixfmt, u32 type)
+ static bool check_format(struct iris_inst *inst, u32 pixfmt, u32 type)
  {
- 	const struct iris_fmt *fmt = NULL;
- 	unsigned int size = 0;
- 	unsigned int i;
+ 	unsigned int size, i;
+ 	const u32 *fmt;
+ 
  	switch (type) {
  	case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
  		fmt = inst->core->iris_platform_data->inst_iris_fmts;