From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mauro Carvalho Chehab Subject: Re: linux-next: please clean up the v4l-dvb-next tree Date: Tue, 19 Feb 2019 21:10:33 -0300 Message-ID: <20190219211007.4a916a62@coco.lan> References: <20190220105703.69c9b582@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20190220105703.69c9b582@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: Linux Next Mailing List , Linux Kernel Mailing List List-Id: linux-next.vger.kernel.org Em Wed, 20 Feb 2019 10:57:03 +1100 Stephen Rothwell escreveu: > Hi Mauro, > > It seems most (if not all) of the commits in the v4l-dvb-next tree are > also in the v4l-dvb tree and are now causing lots of conflicts when I > merge them both. Please clean it up. > Yeah, it had some branches that got already merged. Just updated it to be in sync with v4l-dvb tree. Sorry for the mess. Thanks, Mauro