From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mauro Carvalho Chehab Subject: Re: linux-next: manual merge of the v4l-dvb tree with the asm-generic tree Date: Wed, 4 Apr 2018 06:41:20 -0300 Message-ID: <20180404064112.747dbe14@vento.lan> References: <20180315122921.24520368@canb.auug.org.au> <20180404090900.2cc0645e@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20180404090900.2cc0645e@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: Arnd Bergmann , Linux-Next Mailing List , Linux Kernel Mailing List , Hans Verkuil List-Id: linux-next.vger.kernel.org Em Wed, 4 Apr 2018 09:09:00 +1000 Stephen Rothwell escreveu: > Hi all, > > On Thu, 15 Mar 2018 12:29:21 +1100 Stephen Rothwell wrote: > > > > Today's linux-next merge of the v4l-dvb tree got a conflict in: > > > > drivers/media/platform/blackfin/bfin_capture.c > > > > between commit: > > > > b9ec40bf7d29 ("media: platform: remove blackfin capture driver") > > > > from the asm-generic tree and commit: > > > > 4471109e3894 ("media: convert g/s_parm to g/s_frame_interval in subdevs") > > > > from the v4l-dvb tree. > > > > I fixed it up (I just removed the file) 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. > > This conflict now exists between the v4l-dvb tree and Linus' tree. Thanks for warning me. Merged from Linus on all media trees/branches. -- Thanks, Mauro