Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-10-21--09-00 (v6.12-rc3-899-g82cdb72507ae) remotes/brancher/net-next-2024-10-21--12-00 (v6.12-rc3-894-g49ddca80eb33) ==== BASE DIFF ==== MAINTAINERS | 6 + drivers/net/ethernet/freescale/fman/mac.c | 68 ++- drivers/net/ethernet/freescale/fman/mac.h | 6 +- drivers/net/ethernet/hisilicon/Kconfig | 18 +- drivers/net/ethernet/hisilicon/Makefile | 1 + drivers/net/ethernet/hisilicon/hibmcge/Makefile | 8 + .../net/ethernet/hisilicon/hibmcge/hbg_common.h | 131 ++++ .../net/ethernet/hisilicon/hibmcge/hbg_ethtool.c | 17 + .../net/ethernet/hisilicon/hibmcge/hbg_ethtool.h | 11 + drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.c | 271 +++++++++ drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.h | 59 ++ drivers/net/ethernet/hisilicon/hibmcge/hbg_irq.c | 127 ++++ drivers/net/ethernet/hisilicon/hibmcge/hbg_irq.h | 11 + drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c | 253 ++++++++ drivers/net/ethernet/hisilicon/hibmcge/hbg_mdio.c | 222 +++++++ drivers/net/ethernet/hisilicon/hibmcge/hbg_mdio.h | 12 + drivers/net/ethernet/hisilicon/hibmcge/hbg_reg.h | 143 +++++ drivers/net/ethernet/hisilicon/hibmcge/hbg_txrx.c | 409 +++++++++++++ drivers/net/ethernet/hisilicon/hibmcge/hbg_txrx.h | 39 ++ .../ethernet/mellanox/mlx5/core/en/tc/ct_fs_smfs.c | 4 +- .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 2 +- .../mellanox/mlx5/core/esw/diag/qos_tracepoint.h | 53 +- .../net/ethernet/mellanox/mlx5/core/esw/legacy.c | 27 +- drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 669 +++++++++++---------- drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h | 3 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 25 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 4 +- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 9 +- .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 35 +- drivers/net/virtio_net.c | 2 +- drivers/net/wwan/wwan_core.c | 2 +- include/linux/netdevice.h | 12 + net/sched/sch_generic.c | 8 +- 34 files changed, 2249 insertions(+), 420 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.fGnSkCt1Pf b/tmp/tmp.qk8UkuVr8v index c88535f992c7..3b8e3c6b478f 100644 --- a/tmp/tmp.fGnSkCt1Pf +++ b/tmp/tmp.qk8UkuVr8v @@ -2,6 +2,10 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours +selftests: mptcp: list sysctl data +mptcp: remove unneeded lock when listing scheds +mptcp: init: protect sched with rcu_read_lock +macsec: Fix use-after-free while sending the offloading packet bonding: add ns target multicast address to slave device net: stmmac: TSO: Fix unbalanced DMA map/unmap for non-paged SKB data net: stmmac: dwmac4: Receive Watchdog Timeout is not in abnormal interrupt summary @@ -11,6 +15,8 @@ net: stmmac: dwmac4: Fix high address display by updating reg_space[] from regis net: ena: Add PHC documentation net: ena: PHC silent reset net: ena: Add PHC support in the ENA driver +Documentation: bonding: add XDP support explanation +bonding: return detailed error when loading native XDP fails net: ftgmac100: refactor getting phy device handle net: bnxt: use ethtool string helpers docs: networking: Describe irq suspension @@ -148,7 +154,6 @@ net: pcs: xpcs: replace open-coded mii_bmcr_encode_fixed() net: pcs: xpcs: rearrange xpcs_link_up_1000basex() net: pcs: xpcs: remove switch() in xpcs_link_up_1000basex() net: pcs: xpcs: use generic register definitions -xfrm: migrate: work around 0 if_id on migrate net: netconsole: split send_msg_fragmented net: netconsole: do not pass userdata up to the tail net: netconsole: extract release appending into separate function @@ -188,52 +193,9 @@ selftests: ncdevmem: Make client_ip optional selftests: ncdevmem: Unify error handling selftests: ncdevmem: Separate out dmabuf provider selftests: ncdevmem: Redirect all non-payload output to stderr -net/mlx5: fs, rename modify header struct member action -net/mlx5: fs, rename packet reformat struct member action -net/mlx5: Only create VEPA flow table when in VEPA mode -net/mlx5: Add sync reset drop mode support -net/mlx5: Generalize QoS operations for nodes and vports -net/mlx5: Simplify QoS scheduling element configuration -net/mlx5: Remove vport QoS enabled flag -net/mlx5: Refactor vport QoS to use scheduling node structure -net/mlx5: Refactor vport scheduling element creation function -net/mlx5: Introduce node struct and rename group terminology to node -net/mlx5: Rename vport QoS group reference to parent -net/mlx5: Restrict domain list insertion to root TSAR ancestors -net/mlx5: Add parent group support in rate group structure -net/mlx5: Introduce node type to rate group structure -net/mlx5: Refactor QoS group scheduling element creation -virtio_net: fix integer overflow in stats ethernet: cavium: Replace deprecated PCI functions gpio: Replace deprecated PCI functions block: mtip32xx: Replace deprecated PCI functions fpga/dfl-pci.c: Replace deprecated PCI functions PCI: Deprecate pcim_iounmap_regions() PCI: Make pcim_iounmap_region() a public function -Documentation: bonding: add XDP support explanation -bonding: use correct return value -bonding: return detailed error when loading native XDP fails -net: fix races in netdev_tx_sent_queue()/dev_watchdog() -net: ip: make ip_route_use_hint() return drop reasons -net: ip: make ip_mkroute_input/__mkroute_input return drop reasons -net: ip: make ip_route_input() return drop reasons -net: ip: make ip_route_input_noref() return drop reasons -net: ip: make ip_route_input_rcu() return drop reasons -net: ip: make ip_route_input_slow() return drop reasons -net: ip: make ip_mc_validate_source() return drop reason -net: ip: make ip_route_input_mc() return drop reason -net: ip: make fib_validate_source() return drop reason -net: ip: refactor fib_validate_source/__fib_validate_source -net: wwan: fix global oob in wwan_rtnl_policy -net: hibmcge: Add maintainer for hibmcge -net: hibmcge: Add a Makefile and update Kconfig for hibmcge -net: hibmcge: Implement some ethtool_ops functions -net: hibmcge: Implement rx_poll function to receive packets -net: hibmcge: Implement .ndo_start_xmit function -net: hibmcge: Implement some .ndo functions -net: hibmcge: Add interrupt supported in this module -net: hibmcge: Add mdio and hardware configuration supported in this module -net: hibmcge: Add read/write registers supported through the bar space -net: hibmcge: Add pci table supported in this module -fsl/fman: Fix refcount handling of fman-related devices -fsl/fman: Save device references taken in mac_probe()