projects / linux-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6b3099e 8faabc0)
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)
commit07e5c4eb94e6aba96fa11b424b39c5e5576a7713
treeab7c48de9389e6e3c30586630b19ead62ae43637tree
parent6b3099ebca13ecc5d0e7d07b438672addbd65da6commit | diff
parent8faabc041a001140564f718dabe37753e88b37facommit | diff
Merge git://git./linux/kernel/git/netdev/net

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:
MAINTAINERS diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/pensando/ionic/ionic_lif.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/rswitch.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/rswitch.h diff1 | diff2 | blob | history
drivers/net/tun.c diff1 | diff2 | blob | history
include/linux/bpf.h diff1 | diff2 | blob | history
include/linux/filter.h diff1 | diff2 | blob | history
net/core/filter.c diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/smc/af_smc.c diff1 | diff2 | blob | history
net/smc/smc_core.c diff1 | diff2 | blob | history
rust/kernel/net/phy.rs diff1 | diff2 | blob | history
Linux 6.x block layer and io_uring tree(s)