Here's the other part I mentioned, this won't apply unless
https://patchwork.kernel.org/project/linux-wireless/patch/20240415112355.4d34b6a31be7.Ie8453979f5805873a8411c99346bcc3810cd6476@changeid/
is applied first, which actually seems to have a small
conflict right now.
johannes