Messages in this thread | | | From | Kalle Valo <> | Subject | Re: linux-next: manual merge of the wireless-next tree with the wireless tree | Date | Mon, 03 Apr 2023 11:43:31 +0300 |
| |
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all, > > On Fri, 31 Mar 2023 10:49:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: >> >> Today's linux-next merge of the wireless-next tree got a conflict in: >> >> net/mac80211/rx.c >> >> between commit: >> >> a16fc38315f2 ("wifi: mac80211: fix potential null pointer dereference") >> >> from the wireless tree and commit: >> >> fe4a6d2db3ba ("wifi: mac80211: implement support for yet another mesh A-MSDU format") >> >> from the wireless-next tree. >> >> I fixed it up (see below) and can carry the fix as necessary. This >> is now fixed as far as linux-next is concerned, but any non trivial >> conflicts should be mentioned to your upstream maintainer when your tree >> is submitted for merging. You may also want to consider cooperating >> with the maintainer of the conflicting tree to minimise any particularly >> complex conflicts.
[...]
> This is now a conflict between the net-next and net trees.
My plan is to submit wireless-next pull request to net-next by Wednesday, that should fix the conflict.
-- https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
| |