Skip to content
Commit 3be042cf authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files


Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

drivers/net/ethernet/stmicro/stmmac/common.h
  38cc3c6d ("net: stmmac: protect updates of 64-bit statistics counters")
  fd5a6a71 ("net: stmmac: est: Per Tx-queue error count for HLBF")
  c5c3e1bf ("net: stmmac: Offload queueMaxSDU from tc-taprio")

drivers/net/wireless/microchip/wilc1000/netdev.c
  c9013880 ("wifi: fill in MODULE_DESCRIPTION()s for wilc1000")
  328efda2 ("wifi: wilc1000: do not realloc workqueue everytime an interface is added")

net/unix/garbage.c
  11498715 ("af_unix: Remove io_uring code for GC.")
  1279f9d9 ("af_unix: Call kfree_skb() for dead unix_(sk)->oob_skb in GC.")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b6b61455 1f719a2f
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