From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 19 Jun 2023 10:03:51 +0000 (+0200)
Subject: Merge wireless into wireless-next
X-Git-Tag: v6.5-rc1~163^2~28^2~150
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d5a17cfb9875a873474985f630b5061a4f2142b2;p=linux-2.6-block.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 <johannes.berg@intel.com>
---

d5a17cfb9875a873474985f630b5061a4f2142b2