On Tue, 21 Dec 2021 12:25:31 +0100 Johannes Berg wrote: > We have a couple more changes in the wireless stack, > and in part I'm asking you to pull them in order to > fix linux-next. > > Note that there are two merge conflicts with net-next: > > 1) There's a merge conflict in net/wireless/reg.c, > which is pretty simple, but you can see a sample > resolution from Stephen here: > https://lore.kernel.org/r/20211221111950.57ecc6a7@xxxxxxxxxxxxxxxx > > 2) There's an API change in mac80211-next that affects > code I didn't yet have, a change for ath10k is needed, > again from Stephen we have a sample here: > https://lore.kernel.org/r/20211221115004.1cd6b262@xxxxxxxxxxxxxxxx > > If you prefer I pull back net-next and fix these first, > I can do that as well, just let me know. Thanks for the links, pulled. > Please pull and let me know if there's any (further) problem. There was one faulty Fixes tag in there, FWIW.
