From: "Gustavo F. Padovan" <padovan@profusion.mobi>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jiejing Zhang <kzjeef@gmail.com>, Felipe Balbi <balbi@ti.com>
Subject: Re: linux-next: manual merge of the tty tree with the bluetooth tree
Date: Tue, 26 Apr 2011 15:40:19 -0300 [thread overview]
Message-ID: <20110426184019.GD2242@joana> (raw)
In-Reply-To: <20110426125646.GB6272@kroah.com>
* Greg KH <greg@kroah.com> [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
next prev parent reply other threads:[~2011-04-26 18:40 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
2011-04-26 18:40 ` Gustavo F. Padovan [this message]
-- 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=20110426184019.GD2242@joana \
--to=padovan@profusion.mobi \
--cc=balbi@ti.com \
--cc=greg@kroah.com \
--cc=kzjeef@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.