Merge tag 'mac80211-next-for-davem-2018-06-29' of git://git.kernel.org/pub/scm/linux...

Small merge conflict in net/mac80211/scan.c, I preserved
the kcalloc() conversion. -DaveM

Johannes Berg says:

====================
This round's updates:
 * finally some of the promised HE code, but it turns
   out to be small - but everything kept changing, so
   one part I did in the driver was >30 patches for
   what was ultimately <200 lines of code ... similar
   here for this code.
 * improved scan privacy support - can now specify scan
   flags for randomizing the sequence number as well as
   reducing the probe request element content
 * rfkill cleanups
 * a timekeeping cleanup from Arnd
 * various other cleanups
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc include/uapi/linux/nl80211.h
Simple merge

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/mac80211/scan.c
index 2e917a6d239d234ce671b8b4017dbd23c4be5b2e,ae77d1c1285623ed7a595223dfb9bf0a1a0b5ce9..5d2a11777718c42c3ba4affb190904d2b7bd61de
--- 1/net/mac80211/scan.c
--- 2/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@@ -1157,7 -1197,10 +1197,10 @@@ int __ieee80211_request_sched_scan_star
                }
        }
  
 -      ie = kzalloc(num_bands * iebufsz, GFP_KERNEL);
+       if (req->flags & NL80211_SCAN_FLAG_MIN_PREQ_CONTENT)
+               flags |= IEEE80211_PROBE_FLAG_MIN_CONTENT;
+ 
 +      ie = kcalloc(iebufsz, num_bands, GFP_KERNEL);
        if (!ie) {
                ret = -ENOMEM;
                goto out;

diff --cc net/mac80211/util.c
Simple merge

diff --cc net/wireless/core.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc net/wireless/util.c
Simple merge