linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless <linux-wireless@vger.kernel.org>
Subject: Re: wireless tree status
Date: Mon, 25 Nov 2013 09:51:51 +0100	[thread overview]
Message-ID: <1385369511.4443.2.camel@jlt4.sipsolutions.net> (raw)
In-Reply-To: <1385326492.23961.10.camel@jlt4.sipsolutions.net> (sfid-20131124_215503_335794_81025238)

On Sun, 2013-11-24 at 21:54 +0100, Johannes Berg wrote:
> John,
> 
> were you planning to pull 3.13-rc1 into wireless.git?

Same question for wireless-next btw, but I think you should definitely
pull it in there for the genetlink changes I made through the net tree
recently. Otherwise we'll get conflicts in nl80211 for everything. In
fact even in wireless.git I believe we'd get conflicts but those are
less interesting (some bug fixes I have pending conflict slightly with
the genl changes).

johannes


      reply	other threads:[~2013-11-25  8:51 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-24 20:54 wireless tree status Johannes Berg
2013-11-25  8:51 ` Johannes Berg [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=1385369511.4443.2.camel@jlt4.sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --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).