netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: johannes@sipsolutions.net
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: Re: pull-request: mac80211-next 2016-02-26
Date: Tue, 01 Mar 2016 17:11:10 -0500 (EST)	[thread overview]
Message-ID: <20160301.171110.1945667051881874679.davem@davemloft.net> (raw)
In-Reply-To: <1456519067-8175-1-git-send-email-johannes@sipsolutions.net>

From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri, 26 Feb 2016 21:37:46 +0100

> Let's try this again. I backed out some of the rfkill changes
> that are buggy and fixed some of that too. I also left out the
> one that generated the big discussion, but I still think it's
> the saner thing to do rather than requiring userspace to poke
> around that much with sysfs when all it wants to do is tell
> us what it thinks should be "airplane mode". Anyway, wanted to
> get these things in before sorting that out.
> 
> Still the ARM patch in here - acked by the relevant people to
> fit into the series (rfkill -> ARM -> rfkill with dependencies
> that way); and, as Emmanuel reminded me, an iwlwifi patch that
> has similar dependency issues and we decided to take through
> my tree.
> 
> Let me know if there's any problem.

There was a minor merge conflict with net/mac80211/debugfs.c, take
a look and send me any fixups necessary.

Thanks!

  reply	other threads:[~2016-03-01 22:11 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-26 20:37 pull-request: mac80211-next 2016-02-26 Johannes Berg
2016-03-01 22:11 ` David Miller [this message]
2016-03-01 23:16   ` Johannes Berg

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=20160301.171110.1945667051881874679.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=johannes@sipsolutions.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@vger.kernel.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).