From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: Re: next-20150604 build: 2 failures 37 warnings (next-20150604) Date: Mon, 8 Jun 2015 13:56:32 -0700 Message-ID: <20150608205632.GB11211@kroah.com> References: <20150604170112.GM14071@sirena.org.uk> <20150604171004.GZ30984@atomide.com> <20150604172026.GA30984@atomide.com> <20150605104900.GA5346@kroah.com> <20150605171652.GB14071@sirena.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:57867 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753245AbbFHU4d (ORCPT ); Mon, 8 Jun 2015 16:56:33 -0400 Content-Disposition: inline In-Reply-To: <20150605171652.GB14071@sirena.org.uk> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Mark Brown Cc: Tony Lindgren , Sebastian Andrzej Siewior , kernel-build-reports@lists.linaro.org, linaro-kernel@lists.linaro.org, linux-next@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org On Fri, Jun 05, 2015 at 06:16:52PM +0100, Mark Brown wrote: > On Fri, Jun 05, 2015 at 07:49:00PM +0900, Greg Kroah-Hartman wrote: > > On Thu, Jun 04, 2015 at 10:20:26AM -0700, Tony Lindgren wrote: > > > > Greg, there's now commit 9809889c708e in tty-linus and commit > > > 9e91597f2423 in tty-next. > > > Yes, I can't go back and remove the one in tty-next, I'm guessing when > > they are merged there is an issue. I'll look into that after Linus > > pulls in my tty-linus tree. > > Yeah, git isn't always spectacularly good at resolving add/add if > there's context changes between two things in a merge - it sometimes > ends up double adding things. Ok, I've now merged these branches together, if someone can verify that my tty-next branch is correct, that would be great. thanks, greg k-h