From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Gustavo F. Padovan" Subject: Re: linux-next: manual merge of the tty tree with the bluetooth tree Date: Tue, 26 Apr 2011 15:40:19 -0300 Message-ID: <20110426184019.GD2242@joana> References: <20110426175530.d27179e2.sfr@canb.auug.org.au> <20110426125646.GB6272@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-gw0-f46.google.com ([74.125.83.46]:39023 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826Ab1DZSkF (ORCPT ); Tue, 26 Apr 2011 14:40:05 -0400 Content-Disposition: inline In-Reply-To: <20110426125646.GB6272@kroah.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Greg KH Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jiejing Zhang , Felipe Balbi * Greg KH [2011-04-26 05:56:46 -0700]: > On Tue, Apr 26, 2011 at 05:55:30PM +1000, Stephen Rothwell wrote: > > Hi Greg, > > > > Today's linux-next merge of the tty tree got a conflict in > > drivers/bluetooth/hci_ldisc.c between commit 78b4a56c28c0 ("Bluetooth: > > hci_uart: check the return value of recv()") from the bluetooth tree and > > commit b1c43f82c5aa ("tty: make receive_buf() return the amout of bytes > > received") from the tty tree. > > > > I fixed it up (see below) and can carry the fix as necessary. > > The fix looks correct to me, thanks for doing this. It's ok to me as well, thanks for the fix! -- Gustavo F. Padovan http://profusion.mobi