From mboxrd@z Thu Jan  1 00:00:00 1970
From: Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the tty tree with the tty.current
 tree
Date: Mon, 25 May 2015 09:28:21 -0700
Message-ID: <20150525162821.GI9772@kroah.com>
References: <20150525181938.278a605c@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20150525181938.278a605c@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dave Martin <Dave.Martin@arm.com>, Jakub Kicinski <kubakici@wp.pl>
List-Id: linux-next.vger.kernel.org

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 :)

greg k-h