From: Johannes Berg Date: Wed, 23 May 2018 09:05:26 +0000 (+0200) Subject: Merge remote-tracking branch 'net-next/master' into mac80211-next X-Git-Tag: v5.15~8692^2~161^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd8070bff204a67fcb6585f18047841a895b68d7;p=platform%2Fkernel%2Flinux-starfive.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 --- dd8070bff204a67fcb6585f18047841a895b68d7