From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752064AbdIDFXM (ORCPT ); Mon, 4 Sep 2017 01:23:12 -0400 Received: from ozlabs.org ([103.22.144.67]:49861 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751266AbdIDFXK (ORCPT ); Mon, 4 Sep 2017 01:23:10 -0400 Date: Mon, 4 Sep 2017 15:23:07 +1000 From: Stephen Rothwell To: Mauro Carvalho Chehab , Olof Johansson , Arnd Bergmann , ARM Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Sean Young , Steve Longerbeam , Shawn Guo Subject: Re: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree Message-ID: <20170904152307.33f9ba2a@canb.auug.org.au> In-Reply-To: <20170822105534.7f52bda0@canb.auug.org.au> References: <20170822105534.7f52bda0@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, On Tue, 22 Aug 2017 10:55:34 +1000 Stephen Rothwell wrote: > > 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 Just a reminder that this conflict still exists. -- Cheers, Stephen Rothwell From mboxrd@z Thu Jan 1 00:00:00 1970 From: sfr@canb.auug.org.au (Stephen Rothwell) Date: Mon, 4 Sep 2017 15:23:07 +1000 Subject: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree In-Reply-To: <20170822105534.7f52bda0@canb.auug.org.au> References: <20170822105534.7f52bda0@canb.auug.org.au> Message-ID: <20170904152307.33f9ba2a@canb.auug.org.au> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi all, On Tue, 22 Aug 2017 10:55:34 +1000 Stephen Rothwell wrote: > > 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 Just a reminder that this conflict still exists. -- Cheers, Stephen Rothwell