Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932075AbbEZNQK (ORCPT ); Tue, 26 May 2015 09:16:10 -0400 Received: from [146.101.78.143] ([146.101.78.143]:51915 "EHLO eu-smtp-delivery-143.mimecast.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754011AbbEZNQD convert rfc822-to-8bit (ORCPT ); Tue, 26 May 2015 09:16:03 -0400 Date: Tue, 26 May 2015 12:08:13 +0100 From: Dave Martin To: Greg KH Cc: Stephen Rothwell , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Jakub Kicinski Subject: Re: linux-next: manual merge of the tty tree with the tty.current tree Message-ID: <20150526110813.GC3999@e103592.cambridge.arm.com> References: <20150525181938.278a605c@canb.auug.org.au> <20150525162821.GI9772@kroah.com> MIME-Version: 1.0 In-Reply-To: <20150525162821.GI9772@kroah.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginalArrivalTime: 26 May 2015 11:08:13.0884 (UTC) FILETIME=[42706FC0:01D097A4] X-MC-Unique: hHy10bejSqGCeiw490txYw-1 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1070 Lines: 27 On Mon, May 25, 2015 at 05:28:21PM +0100, Greg KH wrote: > On Mon, May 25, 2015 at 06:19:38PM +1000, Stephen Rothwell wrote: > > Hi Greg, > > > > Today's linux-next merge of the tty tree got a conflict in > > drivers/tty/serial/amba-pl011.c between commit 43dd1f9a5b05 > > ("serial/amba-pl011: Unconditionally poll for FIFO space before each TX > > char") from the tty.current tree and commit 1e84d22322ce > > ("serial/amba-pl011: Refactor and simplify TX FIFO handling") from the > > tty tree. > > > > I fixed it up (I just used the version from the tty tree) and can carry > > the fix as necessary (no action is required). > > Thanks, that's the correct fix, Dave predicted this would happen :) Agreed (and thanks to Stephen for flagging up the mismerge affecting these patches the first time around). Cheers ---Dave -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/