Messages in this thread | | | Subject | Re: linux-next: manual merge of the wireless-next tree with the origin tree | From | Johannes Berg <> | Date | Tue, 22 Feb 2022 17:45:11 +0100 |
| |
Hi,
> Today's linux-next merge of the wireless-next tree got a conflict in: > > net/mac80211/mlme.c > > between commit: > > a72c01a94f1d2 ("mac80211: mlme: check for null after calling kmemdup") > > from the origin tree and commit: > > 820acc810fb6e ("mac80211: Add EHT capabilities to association/probe request") > > from the wireless-next tree.
Thanks. I think Stephen had also noticed this before.
Maybe I'll just move the new code around so it doesn't conflict anymore ;)
johannes
| |