From: Gustavo Padovan <gustavo@padovan.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Gustavo F. Padovan" <padovan@profusion.mobi>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Johan Hedberg <johan.hedberg@intel.com>,
"John W. Linville" <linville@tuxdriver.com>,
Marcel Holtmann <marcel@holtmann.org>
Subject: Re: linux-next: manual merge of the bluetooth tree with the wireless tree
Date: Tue, 12 Jun 2012 03:11:58 -0300 [thread overview]
Message-ID: <20120612061158.GH24440@joana> (raw)
In-Reply-To: <20120612114701.85f70fd92fc42a9c9f2962ac@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 635 bytes --]
Hi Stephen,
* Stephen Rothwell <sfr@canb.auug.org.au> [2012-06-12 11:47:01 +1000]:
> Hi Gustavo,
>
> Today's linux-next merge of the bluetooth tree got a conflict in
> net/bluetooth/hci_event.c between commit 1c2e00418317 ("Bluetooth: Add
> support for encryption key refresh") from the wireless tree and commit
> 6039aa73a132 ("Bluetooth: Remove most of the inline usage") from the
> bluetooth tree.
That is because I just merged bluetooth tree into bluetooth-next, should be
fixed on wireless-next once I do a pull request to John(this is already fixed
in bluetooth-next). Thanks for spotting me this.
Gustavo
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-06-12 6:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-12 1:47 linux-next: manual merge of the bluetooth tree with the wireless tree Stephen Rothwell
2012-06-12 6:11 ` Gustavo Padovan [this message]
2013-09-27 3:26 Stephen Rothwell
2013-09-27 15:08 ` Gustavo Padovan
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=20120612061158.GH24440@joana \
--to=gustavo@padovan.org \
--cc=johan.hedberg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=marcel@holtmann.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;
as well as URLs for NNTP newsgroup(s).