Re: linux-next: manual merge of the iwlwifi-next tree with Linus' tree

[Johannes Berg <johannes@sipsolutions.net>]

Hi Stephen,

Thanks!

> So, at your suggestion, I just used the latter versions of these files,
> but I then got the following build failure:

Ouch, sorry about that. That sounds like it's due to the duplicate
commits you had pointed out, which Miri dropped from iwlwifi-next now.

On the plus side, I'm going to be the one who has to resolve these
conflicts (soon) :)

> So, today I have merged the iwlwifi-next tree from next-20250505 (which
> was effectively empty).  You may want to try merging the iwlwifi tree
> into the iwlwifi-next tree and resolve any conflicts yourself (now that
> the iwlwifi tree has been merged into Linus' tree).

Not sure what you mean by "iwlwifi tree", I think iwlwifi-next/fixes was
empty, so perhaps you meant "wireless tree" instead?

But yeah, I know what all the code is and what's going on, though
evidently less than I thought after the recent updates.

johannes