Re: [GIT PULL] wireless-next-2026-07-26

On Sun, 2026-07-26 at 12:44 +0200, Johannes Berg wrote:

Hi,

Here's a new pull request, big simply because there are two new drivers,
otherwise nothing exciting is going on (yet, I have plenty WiFi8 work
in the pipeline, and so does Qualcomm, I believe).

Two things to note:

1) There's a merge confict, I've done a test merge of this into net-next
   and pushed the result to the merge-wireless-next-2026-07-26 tag. Doing
   only the actual conflict resolution will leave it not building. We've
   discussed which way it should be resolved in this thread:
   https://lore.kernel.org/all/b99e4a1428546030b61883063b9542dd953a69f2.camel@sipsolutions.net/ (local)
   and I think for now the "notify_driver" is the better resolution, even
   if that differs from the original way of handling this failure from
   035ed430ce6a ("wifi: mac80211: avoid non-S1G AID fallback for S1G assoc")

Well, turns out "goto destroy_assoc_data" is actually the better
resolution, hah. I've updated the tag I mentioned, but it really doesn't
matter all that much.

johannes