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

Message-ID: <20231012113648.46eea5ec@canb.auug.org.au>
Date: Thu, 12 Oct 2023 11:37:21 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>, Kalle Valo <kvalo@...nel.org>, Johannes
 Berg <johannes@...solutions.net>
Cc: Networking <netdev@...r.kernel.org>, Wireless
 <linux-wireless@...r.kernel.org>, Johannes Berg <johannes.berg@...el.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the net-next tree with the wireless
 tree

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  net/mac80211/key.c

between commit:

  02e0e426a2fb ("wifi: mac80211: fix error path key leak")

from the wireless tree and commits:

  2a8b665e6bcc ("wifi: mac80211: remove key_mtx")
  7d6904bf26b9 ("Merge wireless into wireless-next")

from the net-next tree.

I fixed it up (I just used the latter, there may be more needed) 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

Content of type "application/pgp-signature" skipped