linux-kernel - Re: linux-next: manual merge of the wireless-next tree with the origin 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] [day] [month] [year] [list]

Message-ID: <116cc3c6cdf4d515a31848dda915b9c21ce02922.camel@sipsolutions.net>
Date:   Tue, 22 Feb 2022 17:45:11 +0100
From:   Johannes Berg <johannes@...solutions.net>
To:     broonie@...nel.org, Kalle Valo <kvalo@...nel.org>,
        Wireless <linux-wireless@...r.kernel.org>
Cc:     Ilan Peer <ilan.peer@...el.com>,
        Jiasheng Jiang <jiasheng@...as.ac.cn>,
        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 the
 origin tree

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