Skip to content
Commit 041c3466 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
Cross-merge networking fixes after downstream PR.

net/mac80211/key.c
  02e0e426 ("wifi: mac80211: fix error path key leak")
  2a8b665e ("wifi: mac80211: remove key_mtx")
  7d6904bf ("Merge wireless into wireless-next")
https://lore.kernel.org/all/20231012113648.46eea5ec@canb.auug.org.au/



Adjacent changes:

drivers/net/ethernet/ti/Kconfig
  a602ee31 ("net: ethernet: ti: Fix mixed module-builtin object")
  98bdeae9 ("net: cpmac: remove driver to prepare for platform removal")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f2cab25b ce55c22e
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment