From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mauro Carvalho Chehab Subject: Re: linux-next: manual merge of the v4l-dvb-next tree with the v4l-dvb tree Date: Thu, 25 Apr 2019 12:23:20 -0300 Message-ID: <20190425122320.2a2ee0f5@coco.lan> References: <20190423105131.7f460991@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Arnd Bergmann Cc: Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , Sean Young List-Id: linux-next.vger.kernel.org Em Tue, 23 Apr 2019 10:12:42 +0200 Arnd Bergmann escreveu: > On Tue, Apr 23, 2019 at 2:51 AM Stephen Rothwell wrote: > > > > Hi all, > > > > Today's linux-next merge of the v4l-dvb-next tree got a conflict in: > > > > drivers/media/platform/Kconfig > > > > between commit: > > > > 63604a143fe1 ("media: seco-cec: fix building with RC_CORE=m") > > > > from the v4l-dvb tree and commit: > > > > 81527254e151 ("media: seco: depend on CONFIG_RC_CORE=y when not a module") > > > > from the v4l-dvb-next tree. > > > > I fixed it up (I just used the v4l-dvb tree version) 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. > > Thanks! > > Both patches are correct, they just use slightly different syntax, so > the merge is fine as well. I just removed the one from fixes, keeping just the one on my master branch. Thanks, Mauro