From: "John W. Linville" <linville@tuxdriver.com>
To: Marcel Holtmann <marcel@holtmann.org>
Cc: "Gustavo F. Padovan" <gustavo@padovan.org>,
"linux-wireless@vger.kernel.org Wireless"
<linux-wireless@vger.kernel.org>,
BlueZ development <linux-bluetooth@vger.kernel.org>,
linux-kernel@vger.kernel.org
Subject: Re: pull request: bluetooth 2014-04-24
Date: Thu, 24 Apr 2014 22:21:03 -0400 [thread overview]
Message-ID: <20140425020421.GD3410@tuxdriver.com> (raw)
In-Reply-To: <C9BCBE06-78C4-41C6-9B70-BFB2C6AFDF7A@holtmann.org>
On Thu, Apr 24, 2014 at 06:51:13PM -0700, Marcel Holtmann wrote:
> Hi John,
>
> > This tag has a lot of stuff in it not in the wireless tree.
> > Please only send me pull requests that only include patches related
> > to Bluetooth.
> >
> >> Some fixes for 3.15. There is a revert for the intel driver, a new device id,
> >> and two important SSP fixes from Johan.
> >> Also we've noticed that your wireless.git tree is not up to date, so this pull
> >> was rebased on top of net.git. If you pull from this you'll will be pulling
> >> net/master from yesterday as well.
>
> as Gustavo explained, this is against net.git since wireless.git has not yet been rebased.
>
> Regards
>
> Marcel
wireless.git is where it is going to be. It is based from a few dozen
commits before -rc1, which was what Dave had as the base of his tree
when I started merging post -rc1 fixes into wireless.git.
I'm sorry if this is inconvenient, but among other things this keeps
net.git and linux.git stuff from getting into wireless-testing.git
prematurely.
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
prev parent reply other threads:[~2014-04-25 2:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-24 14:53 pull request: bluetooth 2014-04-24 Gustavo Padovan
2014-04-25 1:44 ` John W. Linville
2014-04-25 1:51 ` Marcel Holtmann
2014-04-25 2:21 ` John W. Linville [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=20140425020421.GD3410@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=gustavo@padovan.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=marcel@holtmann.org \
/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).