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

Conflicts:

drivers/net/ethernet/ti/icssg/icssg_prueth.c

net/mac80211/chan.c
  89884459 ("wifi: mac80211: fix idle calculation with multi-link")
  87f55002 ("wifi: mac80211: simplify ieee80211_assign_link_chanctx()")
https://lore.kernel.org/all/20240422105623.7b1fbda2@canb.auug.org.au/



net/unix/garbage.c
  1971d13f ("af_unix: Suppress false-positive lockdep splat for spin_lock() in __unix_gc().")
  4090fa37 ("af_unix: Replace garbage collection algorithm.")

drivers/net/ethernet/ti/icssg/icssg_prueth.c
drivers/net/ethernet/ti/icssg/icssg_common.c
  4dcd0e83 ("net: ti: icssg-prueth: Fix signedness bug in prueth_init_rx_chns()")
  e2dc7bfd ("net: ti: icssg-prueth: Move common functions into a separate file")

No adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ec00ed47 52afb15e
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