On Wed, 20 Jan 2021 18:59:21 +0100 Johannes Berg wrote:

Hi Jakub,

quoted

This pull request was applied to netdev/net.git (refs/heads/master):  

Since you pulled this now, question:

I have some pending content for mac80211-next/net-next that either
conflicts with or requires a fix from here, or such.

Could you pull net into net-next, so I can get it into mac80211-next? Or
do you prefer another approach here? I could also double-apply the
single patch, or pull myself but then we'd get a lot of net content into
net-next only via mac80211-next which seems odd.

Just merged net -> net-next, you can do your thing :)

Out of curiosity are you going to rebase mac80211-next or send a PR,
fast forward and then apply the conflicting patches?