linux-kernel - Re: linux-next: manual merge of the wireless-next tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20221019162324.2baaa7e8@kernel.org>
Date:   Wed, 19 Oct 2022 16:23:24 -0700
From:   Jakub Kicinski <kuba@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Johannes Berg <johannes.berg@...el.com>
Cc:     Kalle Valo <kvalo@...nel.org>,
        Johannes Berg <johannes@...solutions.net>,
        Wireless <linux-wireless@...r.kernel.org>,
        David Miller <davem@...emloft.net>,
        Ilan Peer <ilan.peer@...el.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the wireless-next tree with Linus'
 tree

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