Hi all, Today's linux-next merge of the v4l-dvb tree got a conflict in: arch/arm/configs/imx_v6_v7_defconfig between commit: b834bc1c52b8 ("ARM: imx_v6_v7_defconfig: Enable staging video4linux drivers") from the arm-soc tree and commit: b9e1486e0e4b ("media: rc-core: do not depend on MEDIA_SUPPORT") 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. -- Cheers, Stephen Rothwell diff --cc arch/arm/configs/imx_v6_v7_defconfig index 3a48ad809731,1736813bdea7..000000000000 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@@ -230,9 -226,7 +230,9 @@@ CONFIG_REGULATOR_MC13892= CONFIG_REGULATOR_PFUZE100=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y - CONFIG_MEDIA_RC_SUPPORT=y + CONFIG_RC_CORE=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_RC_DEVICES=y CONFIG_IR_GPIO_CIR=y CONFIG_MEDIA_USB_SUPPORT=y -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html