From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 23 May 2018 09:05:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'net-next/master' into mac80211-next
X-Git-Tag: v4.18-rc1~114^2~161^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd8070bff204a67fcb6585f18047841a895b68d7;p=thirdparty%2Flinux.git

Merge remote-tracking branch 'net-next/master' into mac80211-next

Bring in net-next which had pulled in net, so I have the changes
from mac80211 and can apply a patch that would otherwise conflict.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

dd8070bff204a67fcb6585f18047841a895b68d7