From: Gustavo Padovan <gustavo@padovan.org>
To: "John W. Linville" <linville@tuxdriver.com>,
linux-wireless@vger.kernel.org, linux-bluetooth@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: pull request: bluetooth-next 2012-05-16
Date: Wed, 16 May 2012 16:38:00 -0300 [thread overview]
Message-ID: <20120516193800.GG1414@joana> (raw)
In-Reply-To: <20120516192431.GE1414@joana>
* Gustavo Padovan <gustavo@padovan.org> [2012-05-16 16:24:31 -0300]:
> > What did you do here? I thought that maybe you had pulled from the
> > wireless tree, but the commit ID is different.
>
> I did pull from there, actually bluetooth tree, but they have the same head
> now. Something went wrong in the process of re-doing the tree. Sorry for waste
> you time here, John.
>
> I did a correct merge now, the hashs are the same in bluetooth-next:
>
> 671267b Bluetooth: mgmt: Fix device_connected sending order
> a7d7723 Bluetooth: notify userspace of security level change
> 574e02a rtlwifi: fix for race condition when firmware is cached
>
> and in wireless:
>
> 671267b Bluetooth: mgmt: Fix device_connected sending order
> a7d7723 Bluetooth: notify userspace of security level change
> 574e02a rtlwifi: fix for race condition when firmware is cached
>
> Gustavo
>
> ---
>
> The following changes since commit 341352d13dae752610342923c53ebe461624ee2c:
>
> iwlwifi: fix-up some merge damage from commit 0d6c4a2 (2012-05-08 22:18:09 -0400)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next for-upstream
>
> for you to fetch changes up to 48af33a8ff98515915fb40021de91066f2a45d49:
I applied a last minute patch and then realized it was wrong. Just removed it,
the new head is: d839c81372d1f0caee47f87b26a68e91d4ff3847
Gustavo
prev parent reply other threads:[~2012-05-16 19:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-16 15:53 pull request: bluetooth-next 2012-05-16 Gustavo Padovan
2012-05-16 18:09 ` John W. Linville
2012-05-16 19:24 ` Gustavo Padovan
2012-05-16 19:38 ` Gustavo Padovan [this message]
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=20120516193800.GG1414@joana \
--to=gustavo@padovan.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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).