From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> Date: Fri, 25 Jan 2019 20:34:57 +0100 > On Fri, 2019-01-25 at 11:04 -0800, David Miller wrote: >> >> > Dave, it looks like we're the only users of this right now, >> > so let me know if you'd prefer I take it through my tree. >> > Also, this conflicts with the fix I just made to the place >> > where I got it wrong, but obviously the resolution is to >> > just take the version without the maxattr argument. >> >> Please take it through your tree in that case. It'll probably >> be the more painless way to merge this. > > Will do. The most painless would be if you'd merge net into net-next, > then I could pull net-next into mac80211-next and resolve the conflict > before I even apply the patch. In fact, I think either way I'll just > wait until you do that, I suppose you will eventually anyway? Yeah I will probably send Linus a pull request today which means the net --> net-next merge should occur in the next 24 hours.
