From: Johannes Berg <johan...@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 via email to