On Tue, 2022-10-18 at 17:50 +0800, Wen Gong wrote: > > > > https://p.sipsolutions.net/0652bbbbe350b126.txt > > Conflict happened while run "git am" the patch. > > Because missing the "changed |= BSS_CHANGED_EHT_PUNCTURING;" in my > local code, > > also it is missing in > https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git/tree/net/mac80211/util.c > > Maybe "changed |= BSS_CHANGED_EHT_PUNCTURING;" is only existed in your > local code? > Ah yes, we didn't upstream that because there's still this discussion about handling puncturing. But you can probably apply around that. johannes
