]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 5 Dec 2024 19:48:58 +0000 (11:48 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 19 Dec 2024 19:35:07 +0000 (11:35 -0800)
Cross-merge networking fixes after downstream PR (net-6.13-rc4).

No conflicts.

Adjacent changes:

drivers/net/ethernet/renesas/rswitch.h
  32fd46f5b69e ("net: renesas: rswitch: remove speed from gwca structure")
  922b4b955a03 ("net: renesas: rswitch: rework ts tags management")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
14 files changed:
1  2 
MAINTAINERS
Makefile
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
drivers/net/ethernet/pensando/ionic/ionic_lif.c
drivers/net/ethernet/renesas/rswitch.c
drivers/net/ethernet/renesas/rswitch.h
drivers/net/tun.c
include/linux/bpf.h
include/linux/filter.h
net/core/filter.c
net/core/rtnetlink.c
net/smc/af_smc.c
net/smc/smc_core.c
rust/kernel/net/phy.rs

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge