From: Johannes Berg Date: Mon, 19 Jun 2023 10:03:51 +0000 (+0200) Subject: Merge wireless into wireless-next X-Git-Tag: 6.5-rc-smb3-client-fixes-part2~63^2~28^2~150 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=d5a17cfb9875a873474985f630b5061a4f2142b2;p=sfrench%2Fcifs-2.6.git Merge wireless into wireless-next There are some locking changes that will later otherwise cause conflicts, so merge wireless into wireless-next to avoid those. Signed-off-by: Johannes Berg --- d5a17cfb9875a873474985f630b5061a4f2142b2