On Wed, 2021-01-20 at 12:37 -0800, Jakub Kicinski wrote: > On Wed, 20 Jan 2021 18:59:21 +0100 Johannes Berg wrote: > > Hi Jakub, > > > > > 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 :) Ok cool, thanks. > Out of curiosity are you going to rebase mac80211-next or send a PR, > fast forward and then apply the conflicting patches? Normally I'd send a PR for it and then fast-forward. However, it's actually empty at the moment, so I'm just going to fast- forward it to net-next before I apply the next patches :-) johannes
