heads-up: wireless/wireless-next merge conflict

[Johannes Berg <johannes@xxxxxxxxxxxxxxxx>]

Hi,

FYI, there's a merge conflict in wireless vs. wireless-next coming.

I've pushed a resolution to wireless-next/merge-2023-09-11 for you to
use if you like, it's non-trivial due to major locking rework in
wireless-next.

johannes