From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jiejing Zhang <kzjeef@gmail.com>,
"Gustavo F. Padovan" <padovan@profusion.mobi>,
Felipe Balbi <balbi@ti.com>
Subject: Re: linux-next: manual merge of the tty tree with the bluetooth tree
Date: Tue, 26 Apr 2011 05:56:46 -0700 [thread overview]
Message-ID: <20110426125646.GB6272@kroah.com> (raw)
In-Reply-To: <20110426175530.d27179e2.sfr@canb.auug.org.au>
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.
greg k-h
next prev parent reply other threads:[~2011-04-26 12:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-26 7:55 linux-next: manual merge of the tty tree with the bluetooth tree Stephen Rothwell
2011-04-26 12:56 ` Greg KH [this message]
2011-04-26 18:40 ` Gustavo F. Padovan
-- strict thread matches above, loose matches on Subject: below --
2017-04-13 3:36 Stephen Rothwell
2017-05-07 2:54 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110426125646.GB6272@kroah.com \
--to=greg@kroah.com \
--cc=balbi@ti.com \
--cc=kzjeef@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=padovan@profusion.mobi \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox