Hi all,
FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.
Today's linux-next merge of the wireless-next tree got a conflict in:
net/mac80211/util.c
between commit:
ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
from the origin tree and commit:
ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
from the wireless-next tree.
I fixed it up (I just used the latter version) 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.
--
Cheers,
Stephen Rothwell
On Thu, 20 Oct 2022 03:23:40 +1100 Stephen Rothwell wrote:
> Today's linux-next merge of the wireless-next tree got a conflict in:
>
> net/mac80211/util.c
>
> between commit:
>
> ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
>
> from the origin tree and commit:
>
> ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
Dunno if this is a glitch or real problem. But it reminds me - I see
there is direct wireless -> wireless-next merge without going via
Linus's tree. I think you may have mentioned it to us, but not sure
if I said this clearly - let's try to avoid such merges. Linus certainly
doesn't like when we do net -> net-next merges without sending net to
him first and forwarding. I'm not 100% sure why (maybe Steven knows)
- whether it's an aesthetic thing or avoiding real issues thing, but
either way it's _a_ thing :S
On Thu, 20 Oct 2022 04:14:40 +1100 Stephen Rothwell wrote:
> > Dunno if this is a glitch or real problem. But it reminds me - I see
> > there is direct wireless -> wireless-next merge without going via
> > Linus's tree. I think you may have mentioned it to us, but not sure
> > if I said this clearly - let's try to avoid such merges. Linus certainly
> > doesn't like when we do net -> net-next merges without sending net to
> > him first and forwarding. I'm not 100% sure why (maybe Steven knows)
> > - whether it's an aesthetic thing or avoiding real issues thing, but
> > either way it's _a_ thing :S
>
> Has Linus really complained about you merging the net tree into the
> net-next tree?
I can't find that exchange right now. Maybe it was about merging
back his tree into ours without submitting a PR. Hm.
Hi Jakub,
On Wed, 19 Oct 2022 16:23:24 -0700 Jakub Kicinski <[email protected]> wrote:
>
> On Thu, 20 Oct 2022 03:23:40 +1100 Stephen Rothwell wrote:
> > Today's linux-next merge of the wireless-next tree got a conflict in:
> >
> > net/mac80211/util.c
> >
> > between commit:
> >
> > ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
> >
> > from the origin tree and commit:
> >
> > ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
This should have been commit
45ebac4f059b ("wifi: mac80211: Parse station profile from association response")
> Dunno if this is a glitch or real problem. But it reminds me - I see
> there is direct wireless -> wireless-next merge without going via
> Linus's tree. I think you may have mentioned it to us, but not sure
> if I said this clearly - let's try to avoid such merges. Linus certainly
> doesn't like when we do net -> net-next merges without sending net to
> him first and forwarding. I'm not 100% sure why (maybe Steven knows)
> - whether it's an aesthetic thing or avoiding real issues thing, but
> either way it's _a_ thing :S
Has Linus really complained about you merging the net tree into the
net-next tree? The only reason that would be a problem is if (as
happened only once that I remember) Linus rejects the net tree merge
due to some problem. So, yes, wait until after the net (or wireless)
tree has been merged by Linus, but then there should be no reason to
not just merge the net tree (rather than Linus' tree).
--
Cheers,
Stephen Rothwell
Jakub Kicinski <[email protected]> writes:
> On Thu, 20 Oct 2022 04:14:40 +1100 Stephen Rothwell wrote:
>> > Dunno if this is a glitch or real problem. But it reminds me - I see
>> > there is direct wireless -> wireless-next merge without going via
>> > Linus's tree. I think you may have mentioned it to us, but not sure
>> > if I said this clearly - let's try to avoid such merges. Linus certainly
>> > doesn't like when we do net -> net-next merges without sending net to
>> > him first and forwarding. I'm not 100% sure why (maybe Steven knows)
>> > - whether it's an aesthetic thing or avoiding real issues thing, but
>> > either way it's _a_ thing :S
>>
>> Has Linus really complained about you merging the net tree into the
>> net-next tree?
>
> I can't find that exchange right now. Maybe it was about merging
> back his tree into ours without submitting a PR. Hm.
So yes, we merged wireless into wireless-next in commit dfd2d876b3fd
("Merge remote-tracking branch 'wireless/main' into wireless-next"). But
that's only in wireless-next right now, we will send a pull request to
net-next soon.
My understanding is that Linus does not like excessive or pointless
merge requests, and his recent email[1] says similar. But in our case I
think the merge is justified, otherwise we would have conflicts between
trees, which means more work for everyone involved with tree merges and
most likely even bugs if the merge resolutions are difficult.
And we were not planning to do this often, maybe something like once per
cycle and only then there's a strong reason for the merge. Naturally we
would document that in the merge, just like Linus prefers. Thoughts?
[1] https://lore.kernel.org/all/CAHk-=wgb42XG1c_rtwupJMD9QXbJsE6k_TBKYC4YvZ8bkATcVg@mail.gmail.com/
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Hi Stephen,
Stephen Rothwell <[email protected]> writes:
> On Wed, 19 Oct 2022 16:23:24 -0700 Jakub Kicinski <[email protected]> wrote:
>>
>> On Thu, 20 Oct 2022 03:23:40 +1100 Stephen Rothwell wrote:
>> > Today's linux-next merge of the wireless-next tree got a conflict in:
>> >
>> > net/mac80211/util.c
>> >
>> > between commit:
>> >
>> > ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
>> >
>> > from the origin tree and commit:
>> >
>> > ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
>
> This should have been commit
>
> 45ebac4f059b ("wifi: mac80211: Parse station profile from association response")
BTW I have been trying to reproduce this conflict to no avail, do you
still see it?
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Kalle Valo <[email protected]> writes:
> Hi Stephen,
>
> Stephen Rothwell <[email protected]> writes:
>
>> On Wed, 19 Oct 2022 16:23:24 -0700 Jakub Kicinski <[email protected]> wrote:
>>>
>>> On Thu, 20 Oct 2022 03:23:40 +1100 Stephen Rothwell wrote:
>>> > Today's linux-next merge of the wireless-next tree got a conflict in:
>>> >
>>> > net/mac80211/util.c
>>> >
>>> > between commit:
>>> >
>>> > ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
>>> >
>>> > from the origin tree and commit:
>>> >
>>> > ff05d4b45dd8 ("wifi: mac80211: fix MBSSID parsing use-after-free")
>>
>> This should have been commit
>>
>> 45ebac4f059b ("wifi: mac80211: Parse station profile from association response")
>
> BTW I have been trying to reproduce this conflict to no avail, do you
> still see it?
Never mind, I see it now. Sorry for the noise.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches