Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-10-22--09-00 (v6.12-rc3-950-ge7029be07b17) remotes/brancher/net-next-2024-10-22--12-00 (v6.12-rc3-975-g3c1026132fda) ==== BASE DIFF ==== .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 9 +- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 5 + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 5 + drivers/net/phy/marvell.c | 14 + drivers/net/usb/usbnet.c | 3 +- include/net/rtnetlink.h | 12 +- net/bridge/br_netlink.c | 6 +- net/core/rtnetlink.c | 567 ++++++++++++--------- net/ipv4/devinet.c | 3 +- net/ipv6/addrconf.c | 5 +- net/mctp/device.c | 16 +- net/mpls/af_mpls.c | 5 +- net/netfilter/nf_bpf_link.c | 4 + net/netfilter/xt_NFLOG.c | 2 +- net/netfilter/xt_TRACE.c | 1 + net/netfilter/xt_mark.c | 2 +- .../drivers/net/mlxsw/devlink_trap_policer.sh | 85 ++- .../selftests/drivers/net/mlxsw/qos_ets_strict.sh | 167 +++--- .../drivers/net/mlxsw/qos_max_descriptors.sh | 118 ++--- .../selftests/drivers/net/mlxsw/qos_mc_aware.sh | 138 +++-- .../testing/selftests/drivers/net/mlxsw/sch_ets.sh | 26 +- .../selftests/drivers/net/mlxsw/sch_red_core.sh | 185 ++++--- .../selftests/drivers/net/mlxsw/sch_red_ets.sh | 24 +- .../selftests/drivers/net/mlxsw/sch_red_root.sh | 18 +- tools/testing/selftests/net/forwarding/lib.sh | 13 +- tools/testing/selftests/net/forwarding/sch_ets.sh | 7 +- .../selftests/net/forwarding/sch_ets_core.sh | 81 ++- .../selftests/net/forwarding/sch_ets_tests.sh | 14 +- tools/testing/selftests/net/forwarding/sch_red.sh | 103 ++-- .../selftests/net/forwarding/sch_tbf_core.sh | 91 ++-- .../selftests/net/forwarding/sch_tbf_etsprio.sh | 7 +- .../selftests/net/forwarding/sch_tbf_root.sh | 3 +- tools/testing/selftests/net/lib.sh | 3 + tools/testing/selftests/net/lib/Makefile | 2 +- tools/testing/selftests/net/lib/sh/defer.sh | 115 +++++ 35 files changed, 978 insertions(+), 881 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.Plplzj6Al7 b/tmp/tmp.hcGFFPJOnl index cb3c0a4b5201..79b454117f28 100644 --- a/tmp/tmp.Plplzj6Al7 +++ b/tmp/tmp.hcGFFPJOnl @@ -2,13 +2,37 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours +mctp i2c: handle NULL header address +xfrm: fix one more kernel-infoleak in algo dumping +xfrm: validate new SA's prefixlen using SA family when sel.family is unset +xfrm: policy: remove last remnants of pernet inexact list +xfrm: respect ip protocols rules criteria when performing dst lookups +xfrm: extract dst lookup parameters into a struct +net: netfilter: Fix use-after-free in get_info() +net: wwan: t7xx: reset device if suspend fails +net: ftgmac100: refactor getting phy device handle net: fix crash when config small gso_max_size/gso_ipv4_max_size +tests: hsr: Increase timeout to 10 minutes ipv4: ip_tunnel: Fix suspicious RCU usage warning in ip_tunnel_find() +igb: Fix potential invalid memory access in igb_init_module() ipv4: ip_tunnel: Fix suspicious RCU usage warning in ip_tunnel_init_flow() ixgbevf: Fix passing 0 to ERR_PTR in ixgbevf_run_xdp() ixgbe: Fix passing 0 to ERR_PTR in ixgbe_run_xdp() igb: Fix passing 0 to ERR_PTR in igb_run_xdp() igc: Fix passing 0 to ERR_PTR in igc_xdp_run_prog() +MAINTAINERS: update ENETC driver files and maintainers +net: enetc: add preliminary support for i.MX95 ENETC PF +net: enetc: optimize the allocation of tx_bdr +net: enetc: extract enetc_int_vector_init/destroy() from enetc_alloc_msix() +net: enetc: add i.MX95 EMDIO support +PCI: Add NXP NETC vendor ID and device IDs +net: enetc: remove ERR050089 workaround for i.MX95 +net: enetc: build enetc_pf_common.c as a separate module +net: enetc: extract common ENETC PF parts for LS1028A and i.MX95 platforms +net: enetc: add initial netc-blk-ctrl driver support +dt-bindings: net: add bindings for NETC blocks control +dt-bindings: net: add i.MX95 ENETC support +dt-bindings: net: add compatible string for i.MX95 EMDIO igb: Fix spelling "intialize"->"initialize" enic: Adjust used MSI-X wq/rq/cq/interrupt resources in a more robust way enic: Allocate arrays in enic struct based on VIC config @@ -107,7 +131,6 @@ net: atlantic: support reading SFP module info igc: Link queues to NAPI instances igc: Link IRQs to NAPI instances net: dsa: microchip: disable EEE for KSZ879x/KSZ877x/KSZ876x -netfilter: xtables: fix a bad copypaste in xt_nflog module netfliter: xtables: fix typo causing some targets to not load on IPv6 ipmr: Don't mark ip6mr_rtnl_msg_handlers as __initconst r8152: fix deadlock in usb reset during resume @@ -144,7 +167,6 @@ net: hns3: fix missing features due to dev->features configuration too early net: hns3: fixed reset failure issues caused by the incorrect reset type net: hns3: add sync command to sync io-pgtable net: hns3: default enable tx bounce buffer when smmu enabled -selftests: netfilter: remove unused rplnlh parameter netfilter: bpf: Pass string literal as format argument of request_module() tools/net/ynl: improve async notification handling r8169: avoid unsolicited interrupts @@ -183,7 +205,6 @@ net: sysctl: do not reserve an extra char in dump_cpumask temporary buffer net: sysctl: remove always-true condition net: use sock_valbool_flag() only in __sock_set_timestamps() netdevsim: macsec: pad u64 to correct length in logs -netfilter: bpf: must hold reference on net namespace net: pcs: xpcs: remove return statements in void function net: pcs: xpcs: rename xpcs_config_usxgmii() net: pcs: xpcs: combine xpcs_link_up_{1000basex,sgmii}() @@ -201,35 +222,6 @@ net: netconsole: separate fragmented message handling in send_ext_msg net: netconsole: split send_ext_msg_udp() function net: netconsole: remove msg_ready variable tools: ynl-gen: use big-endian netlink attribute types -selftests: mlxsw: devlink_trap_police: Use defer for test cleanup -selftests: mlxsw: qos_max_descriptors: Use defer for test cleanup -selftests: mlxsw: qos_ets_strict: Use defer for test cleanup -selftests: mlxsw: qos_mc_aware: Use defer for test cleanup -selftests: ETS: Use defer for test cleanup -selftests: TBF: Use defer for test cleanup -selftests: RED: Use defer for test cleanup -selftests: forwarding: lib: Allow passing PID to stop_traffic() -selftests: forwarding: Add a fallback cleanup() -selftests: net: lib: Introduce deferred commands -net: usb: usbnet: fix name regression -selftests: nic_performance: Add selftest for performance of NIC driver -selftests: nic_link_layer: Add selftest case for speed and duplex states -selftests: nic_link_layer: Add link layer selftest for NIC driver -mlxsw: spectrum_router: fix xa_store() error checking -net: phy: marvell: Add mdix status reporting -net: stmmac: Programming sequence for VLAN packets with split header -selftests: ncdevmem: Add automated test -selftests: ncdevmem: Move ncdevmem under drivers/net/hw -selftests: ncdevmem: Run selftest when none of the -s or -c has been provided -selftests: ncdevmem: Remove hard-coded queue numbers -selftests: ncdevmem: Use YNL to enable TCP header split -selftests: ncdevmem: Properly reset flow steering -selftests: ncdevmem: Switch to AF_INET6 -selftests: ncdevmem: Remove default arguments -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 ethernet: cavium: Replace deprecated PCI functions gpio: Replace deprecated PCI functions block: mtip32xx: Replace deprecated PCI functions