Subject: linux-next: manual merge of the mac80211-next tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 18 Jun 2018 11:29:43 +1000

Hi all,

Today's linux-next merge of the mac80211-next tree got a conflict in:

  net/mac80211/scan.c

between commit:

  6396bb221514 ("treewide: kzalloc() -> kcalloc()")

from Linus' tree and commit:

  b9771d41aee7 ("mac80211: support scan features for improved scan privacy")

from the mac80211-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

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