Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-05-13--16-00 (v6.15-rc5-1142-gbf4b4d19a509) remotes/brancher/net-next-hw-2025-05-14--00-00 (v6.15-rc5-1155-gc8e1ae48d4aa) ==== BASE DIFF ==== .../bindings/net/renesas,r9a09g057-gbeth.yaml | 2 + .../devicetree/bindings/net/vertexcom-mse102x.yaml | 2 +- Documentation/netlink/specs/netdev.yaml | 12 + Documentation/networking/devmem.rst | 150 ++- .../networking/net_cachelines/net_device.rst | 1 + Documentation/networking/netdev-features.rst | 5 + Documentation/networking/netmem.rst | 23 +- Documentation/networking/timestamping.rst | 8 +- MAINTAINERS | 3 +- drivers/infiniband/hw/irdma/main.c | 125 +- drivers/infiniband/hw/irdma/main.h | 3 +- drivers/infiniband/hw/irdma/osdep.h | 2 +- drivers/infiniband/hw/irdma/type.h | 4 +- drivers/net/dsa/b53/b53_common.c | 61 + drivers/net/dsa/b53/b53_priv.h | 1 + drivers/net/dsa/b53/b53_regs.h | 21 + drivers/net/dsa/bcm_sf2.c | 1 + drivers/net/dsa/hirschmann/hellcreek.h | 2 +- drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c | 24 +- drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h | 5 +- drivers/net/dsa/microchip/ksz_common.c | 135 +- drivers/net/dsa/microchip/ksz_common.h | 2 +- drivers/net/dsa/microchip/ksz_ptp.c | 26 +- drivers/net/dsa/microchip/ksz_ptp.h | 7 +- drivers/net/dsa/mv88e6xxx/chip.h | 2 +- drivers/net/dsa/mv88e6xxx/hwtstamp.c | 24 +- drivers/net/dsa/mv88e6xxx/hwtstamp.h | 16 +- drivers/net/dsa/ocelot/felix.c | 11 +- drivers/net/dsa/sja1105/sja1105_main.c | 6 +- drivers/net/dsa/sja1105/sja1105_ptp.c | 32 +- drivers/net/dsa/sja1105/sja1105_ptp.h | 7 +- drivers/net/ethernet/amd/xgbe/xgbe-common.h | 5 + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 151 ++- drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 87 +- drivers/net/ethernet/amd/xgbe/xgbe-smn.h | 30 + drivers/net/ethernet/amd/xgbe/xgbe.h | 11 + drivers/net/ethernet/cadence/macb_main.c | 19 +- drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 8 +- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 41 +- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 41 +- drivers/net/ethernet/freescale/enetc/Kconfig | 8 + drivers/net/ethernet/freescale/enetc/Makefile | 4 + drivers/net/ethernet/freescale/enetc/enetc.c | 123 +- drivers/net/ethernet/freescale/enetc/enetc.h | 51 +- .../net/ethernet/freescale/enetc/enetc4_debugfs.c | 90 ++ .../net/ethernet/freescale/enetc/enetc4_debugfs.h | 20 + drivers/net/ethernet/freescale/enetc/enetc4_hw.h | 12 + drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 368 +++++- drivers/net/ethernet/freescale/enetc/enetc_cbdr.c | 50 + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 74 +- drivers/net/ethernet/freescale/enetc/enetc_pf.c | 107 +- drivers/net/ethernet/freescale/enetc/enetc_pf.h | 14 +- .../net/ethernet/freescale/enetc/enetc_pf_common.c | 93 +- .../net/ethernet/freescale/enetc/enetc_pf_common.h | 3 + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 12 +- drivers/net/ethernet/freescale/enetc/ntmp.c | 462 +++++++ .../net/ethernet/freescale/enetc/ntmp_private.h | 103 ++ drivers/net/ethernet/freescale/gianfar.c | 53 +- drivers/net/ethernet/google/gve/gve_main.c | 3 + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 8 +- drivers/net/ethernet/intel/ice/devlink/devlink.c | 45 +- drivers/net/ethernet/intel/ice/ice.h | 6 +- drivers/net/ethernet/intel/ice/ice_dcb.c | 2 +- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 47 +- drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 9 + drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 4 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 8 +- drivers/net/ethernet/intel/ice/ice_idc.c | 207 +-- drivers/net/ethernet/intel/ice/ice_idc_int.h | 5 +- drivers/net/ethernet/intel/ice/ice_main.c | 18 +- drivers/net/ethernet/intel/ice/ice_type.h | 6 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 58 +- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 1 + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 7 +- .../ethernet/mellanox/mlx5/core/steering/hws/bwc.c | 330 ++--- .../ethernet/mellanox/mlx5/core/steering/hws/bwc.h | 11 + .../mellanox/mlx5/core/steering/hws/bwc_complex.c | 1348 +++++++++++++++++++- .../mellanox/mlx5/core/steering/hws/bwc_complex.h | 21 + .../mellanox/mlx5/core/steering/hws/definer.c | 212 +++ .../mellanox/mlx5/core/steering/hws/definer.h | 2 + .../mellanox/mlx5/core/steering/hws/matcher.c | 278 +++- .../mellanox/mlx5/core/steering/hws/matcher.h | 9 + .../mellanox/mlx5/core/steering/hws/mlx5hws.h | 2 + .../mellanox/mlx5/core/steering/hws/send.c | 122 +- .../mellanox/mlx5/core/steering/hws/send.h | 1 + .../mellanox/mlx5/core/steering/hws/table.c | 16 +- .../mellanox/mlx5/core/steering/hws/table.h | 5 + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 63 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 7 +- drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 30 +- drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h | 20 +- drivers/net/ethernet/mscc/ocelot_net.c | 33 +- drivers/net/ethernet/mscc/ocelot_ptp.c | 43 +- drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +- drivers/net/ethernet/stmicro/stmmac/common.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 40 - drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 295 +---- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 25 +- .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 89 +- .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 18 + drivers/net/ethernet/stmicro/stmmac/hwif.c | 9 + drivers/net/ethernet/stmicro/stmmac/hwif.h | 62 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c | 374 ++++++ drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.h | 64 + drivers/net/ethernet/vertexcom/mse102x.c | 80 +- drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c | 7 +- drivers/net/ethernet/xscale/ixp4xx_eth.c | 61 +- drivers/net/ipa/data/ipa_data-v3.1.c | 1 - drivers/net/ipa/data/ipa_data-v3.5.1.c | 1 - drivers/net/ipa/data/ipa_data-v4.11.c | 1 - drivers/net/ipa/data/ipa_data-v4.2.c | 1 - drivers/net/ipa/data/ipa_data-v4.5.c | 1 - drivers/net/ipa/data/ipa_data-v4.7.c | 1 - drivers/net/ipa/data/ipa_data-v4.9.c | 1 - drivers/net/ipa/data/ipa_data-v5.0.c | 1 - drivers/net/ipa/data/ipa_data-v5.5.c | 1 - drivers/net/ipa/ipa_data.h | 2 - drivers/net/ipa/ipa_mem.c | 21 +- drivers/net/phy/dp83867.c | 76 +- drivers/net/phy/micrel.c | 7 - include/linux/fsl/ntmp.h | 121 ++ include/linux/micrel_phy.h | 1 - include/linux/net/intel/iidc.h | 109 -- include/linux/net/intel/iidc_rdma.h | 68 + include/linux/net/intel/iidc_rdma_ice.h | 70 + include/linux/netdevice.h | 2 + include/linux/skbuff.h | 17 +- include/linux/skbuff_ref.h | 4 +- include/net/bluetooth/hci_core.h | 1 + include/net/dsa.h | 5 +- include/net/netlink.h | 6 + include/net/netmem.h | 34 +- include/net/sch_generic.h | 15 + include/net/sock.h | 1 + include/soc/mscc/ocelot.h | 7 +- include/uapi/linux/ethtool.h | 134 +- include/uapi/linux/netdev.h | 1 + io_uring/zcrx.c | 3 +- net/batman-adv/hard-interface.c | 31 +- net/batman-adv/main.c | 4 +- net/batman-adv/main.h | 3 +- net/batman-adv/mesh-interface.c | 15 - net/batman-adv/send.c | 4 +- net/batman-adv/translation-table.c | 2 +- net/bluetooth/hci_conn.c | 24 + net/bluetooth/hci_event.c | 73 +- net/bluetooth/mgmt.c | 9 +- net/core/datagram.c | 48 +- net/core/dev.c | 36 +- net/core/devmem.c | 131 +- net/core/devmem.h | 83 +- net/core/netdev-genl-gen.c | 13 + net/core/netdev-genl-gen.h | 1 + net/core/netdev-genl.c | 80 +- net/core/skbuff.c | 48 +- net/core/sock.c | 5 + net/dsa/port.c | 10 +- net/dsa/user.c | 41 +- net/ethtool/ioctl.c | 99 +- net/ipv4/ip_output.c | 3 +- net/ipv4/tcp.c | 48 +- net/ipv6/ip6_output.c | 3 +- net/mctp/device.c | 17 +- net/mctp/route.c | 4 +- net/netlink/policy.c | 5 + net/sched/sch_codel.c | 2 +- net/sched/sch_fq.c | 2 +- net/sched/sch_fq_codel.c | 2 +- net/sched/sch_fq_pie.c | 2 +- net/sched/sch_hhf.c | 2 +- net/sched/sch_pie.c | 2 +- net/vmw_vsock/virtio_transport_common.c | 5 +- tools/include/uapi/linux/netdev.h | 1 + tools/net/ynl/pyynl/cli.py | 15 +- tools/net/ynl/pyynl/ethtool.py | 22 +- tools/net/ynl/pyynl/ynl_gen_c.py | 70 +- tools/testing/selftests/drivers/net/hw/Makefile | 2 - tools/testing/selftests/drivers/net/hw/devmem.py | 26 +- .../selftests/drivers/net/hw/lib/py/__init__.py | 1 - .../selftests/drivers/net/hw/lib/py/linkconfig.py | 222 ---- tools/testing/selftests/drivers/net/hw/ncdevmem.c | 355 +++++- .../selftests/drivers/net/hw/nic_link_layer.py | 113 -- .../selftests/drivers/net/hw/nic_performance.py | 137 -- tools/testing/selftests/drivers/net/lib/py/load.py | 20 +- tools/testing/selftests/drivers/net/ping.py | 16 + tools/testing/selftests/net/bareudp.sh | 49 +- tools/testing/selftests/net/fib_rule_tests.sh | 3 - tools/testing/selftests/net/fib_tests.sh | 3 - tools/testing/selftests/net/icmp_redirect.sh | 2 - tools/testing/selftests/net/lib.sh | 2 + tools/testing/selftests/net/mptcp/mptcp_lib.sh | 2 - .../selftests/net/netfilter/br_netfilter.sh | 3 - .../selftests/net/netfilter/bridge_brouter.sh | 2 - .../selftests/net/netfilter/conntrack_resize.sh | 63 +- .../selftests/net/netfilter/conntrack_vrf.sh | 3 - tools/testing/selftests/net/netfilter/ipvs.sh | 6 - tools/testing/selftests/net/netfilter/nft_fib.sh | 2 - .../selftests/net/netfilter/nft_nat_zones.sh | 2 - tools/testing/selftests/net/netfilter/rpath.sh | 18 +- .../selftests/net/srv6_end_dt46_l3vpn_test.sh | 5 - .../selftests/net/srv6_end_dt4_l3vpn_test.sh | 5 - .../selftests/net/srv6_end_next_csid_l3vpn_test.sh | 77 +- .../net/srv6_end_x_next_csid_l3vpn_test.sh | 83 +- .../selftests/net/srv6_hencap_red_l3vpn_test.sh | 74 +- .../selftests/net/srv6_hl2encap_red_l2vpn_test.sh | 83 +- .../tc-testing/tc-tests/qdiscs/codel.json | 24 + .../selftests/tc-testing/tc-tests/qdiscs/fq.json | 22 + .../tc-testing/tc-tests/qdiscs/fq_codel.json | 22 + .../tc-testing/tc-tests/qdiscs/fq_pie.json | 22 + .../selftests/tc-testing/tc-tests/qdiscs/hhf.json | 22 + .../selftests/tc-testing/tc-tests/qdiscs/pie.json | 24 + tools/testing/vsock/vsock_test.c | 28 +- 216 files changed, 7202 insertions(+), 2906 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.qS0rXW2Pmo b/tmp/tmp.Bj6MDTbPlX index 79914d88bb0a..1d124dbd66ee 100644 --- a/tmp/tmp.qS0rXW2Pmo +++ b/tmp/tmp.Bj6MDTbPlX @@ -8,7 +8,6 @@ forwarding: set timeout to 3 hours documentation: networking: devlink: Fix a typo in devlink-trap.rst net: Look for bonding slaves in the bond's network namespace octeontx2-af: Fix CGX Receive counters -octeontx2-pf: ethtool: Display "Autoneg" and "Port" fields net: apple: bmac: use crc32() instead of hand-rolled equivalent net: ethernet: mtk_eth_soc: fix typo for declaration MT7988 ESW capability net/tg3: use crc32() instead of hand-rolled equivalent @@ -21,8 +20,6 @@ hv_netvsc: Remove rmsg_pgcnt hv_netvsc: Preserve contiguous PFN grouping in the page buffer array hv_netvsc: Use vmbus_sendpacket_mpb_desc() to send VMBus messages Drivers: hv: Allow vmbus_sendpacket_mpb_desc() to create multiple ranges -net: pse-pd: Add Si3474 PSE controller driver -dt-bindings: net: pse-pd: Add bindings for Si3474 PSE controller net: phy: remove stub for mdiobus_register_board_info net: mana: Add handler for hardware servicing events eth: fbnic: Add devlink dev flash support @@ -30,10 +27,6 @@ eth: fbnic: Add mailbox support for PLDM updates eth: fbnic: Add support for multiple concurrent completion messages eth: fbnic: Accept minimum anti-rollback version from firmware pldmfw: Don't require send_package_data or send_component_table to be defined -net: ipa: Make the SMEM item ID constant -net: mlxsw: convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() -net: enetc: convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() -net: txgbe: Fix pending interrupt openvswitch: Stricter validation for the userspace action net: enetc: fix implicit declaration of function FIELD_PREP octeontx2-pf: Fix ethtool support for SDP representors @@ -43,118 +36,10 @@ net: phy: remove Kconfig symbol MDIO_DEVRES net: stmmac: generate software timestamp just before the doorbell net: cxgb4: generate software timestamp just before the doorbell net: atlantic: generate software timestamp just before the doorbell -net: bonding: add tracepoint for 802.3ad -net: bonding: send peer notify when failure recovery -net: bonding: add broadcast_neighbor netlink option -net: bonding: add broadcast_neighbor option for 802.3ad Documentation: netlink: specs: tc: Add DualPI2 specification selftests/tc-testing: Add selftests for qdisc DualPI2 sched: Add enqueue/dequeue of dualpi2 qdisc sched: Dump configuration and statistics of dualpi2 qdisc sched: Struct definition and parsing of dualpi2 qdisc -tcp: try to avoid safer when ACKs are thinned -tcp: accecn: try to fit AccECN option with SACK -tcp: accecn: AccECN ACE field multi-wrap heuristic -tcp: accecn: AccECN option ceb/cep heuristic -tcp: accecn: AccECN option failure handling -tcp: accecn: AccECN option send control -tcp: accecn: AccECN option -tcp: sack option handling improvements -tcp: accecn: AccECN needs to know delivered bytes -tcp: accecn: add AccECN rx byte counters -tcp: accecn: AccECN negotiation -tcp: AccECN core -tcp: reorganize tcp_sock_write_txrx group for variables later -tcp: fast path functions later -tcp: reorganize SYN ECN code net: airoha: Add the capability to allocate hw buffers in SRAM dt-bindings: net: airoha: Add EN7581 memory-region property -vsock/test: Fix occasional failure in SIOCOUTQ tests -Merge branch 'amd-xgbe-add-support-for-amd-renoir' -amd-xgbe: add support for new pci device id 0x1641 -amd-xgbe: Add XGBE_XPCS_ACCESS_V3 support to xgbe_pci_probe() -amd-xgbe: add support for new XPCS routines -amd-xgbe: reorganize the xgbe_pci_probe() code path -amd-xgbe: reorganize the code of XPCS access -Merge branch 'tools-ynl-gen-support-sub-types-for-binary-attributes' -tools: ynl-gen: support struct for binary attributes -tools: ynl-gen: auto-indent else -tools: ynl-gen: support sub-type for binary attributes -Merge branch 'device-memory-tcp-tx' -selftests: ncdevmem: Implement devmem TCP TX -net: check for driver support in netmem TX -gve: add netmem TX support to GVE DQO-RDA mode -net: enable driver support for netmem TX -net: add devmem TCP TX documentation -net: devmem: Implement TX path -net: devmem: TCP tx netlink api -net: add get_netmem/put_netmem support -netmem: add niov->type attribute to distinguish different net_iov types -net: dsa: b53: implement setting ageing time -net: mlx4: add SOF_TIMESTAMPING_TX_SOFTWARE flag when getting ts info -netlink: fix policy dump for int with validation callback -Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux -Merge branch 'net-vertexcom-mse102x-improve-rx-handling' -net: vertexcom: mse102x: Simplify mse102x_rx_pkt_spi -net: vertexcom: mse102x: Return code for mse102x_rx_pkt_spi -net: vertexcom: mse102x: Implement flag for valid CMD -net: vertexcom: mse102x: Drop invalid cmd stats -net: vertexcom: mse102x: Add warning about IRQ trigger type -dt-bindings: vertexcom-mse102x: Fix IRQ type in example -net: phy: dp83867: use 2ns delay if not specified in DTB -net: phy: dp83867: remove check of delay strap configuration -dt-bindings: net: renesas-gbeth: Add support for RZ/V2N (R9A09G056) SoC -Merge branch 'selftests-net-configure-rp_filter-in-setup_ns' -selftests: mptcp: remove rp_filter configuration -selftests: netfilter: remove rp_filter configuration -selftests: net: use setup_ns for SRv6 tests and remove rp_filter configuration -selftests: net: use setup_ns for bareudp testing -selftests: net: remove redundant rp_filter configuration -selftests: net: disable rp_filter after namespace initialization -net: ixp4xx_eth: convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() -selftests: drv-net: ping: make sure the ping test restores checksum offload -net/mlx5: support software TX timestamp -Merge branch 'refactoring-designware-vlan-code' -net: stmmac: dwxgmac2: Add support for HW-accelerated VLAN stripping -net: stmmac: stmmac_vlan: rename VLAN functions and symbol to generic symbol. -net: stmmac: Refactor VLAN implementation -Merge tag 'batadv-next-pullrequest-20250509' of git://git.open-mesh.org/linux-merge -net: mvpp2: convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() -net: gianfar: convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() -net: dpaa2-eth: add ndo_hwtstamp_get() implementation -net: dpaa2-eth: convert to ndo_hwtstamp_set() -Merge branch 'dpaa_eth-conversion-to-ndo_hwtstamp_get-and-ndo_hwtstamp_set' -net: dpaa_eth: simplify dpaa_ioctl() -net: dpaa_eth: add ndo_hwtstamp_get() implementation -net: dpaa_eth: convert to ndo_hwtstamp_set() -net: dsa: convert to ndo_hwtstamp_get() and ndo_hwtstamp_set() -tools: ynl: handle broken pipe gracefully in CLI -ethtool: Block setting of symmetric RSS when non-symmetric rx-flow-hash is requested -net: thunder: make tx software timestamp independent -iidc/ice/irdma: Update IDC to support multiple consumers -Merge branch 'add-more-features-for-enetc-v4-round-2' -net: enetc: add loopback support for i.MX95 ENETC PF -net: enetc: add VLAN filtering support for i.MX95 ENETC PF -net: enetc: move generic VLAN hash filter functions to enetc_pf_common.c -net: enetc: extract enetc_refresh_vlan_ht_filter() -net: enetc: enable RSS feature by default -net: enetc: change enetc_set_rss() to void type -net: enetc: add RSS support for i.MX95 ENETC PF -net: enetc: make enetc_set_rss_key() reusable -net: enetc: add set/get_rss_table() hooks to enetc_si_ops -net: enetc: add debugfs interface to dump MAC filter -net: enetc: add MAC filtering for i.MX95 ENETC PF -net: enetc: move generic MAC filtering interfaces to enetc-core -net: enetc: add command BD ring support for i.MX95 ENETC -net: enetc: add initial netc-lib driver to support NTMP -selftests: net-drv: remove the nic_performance and nic_link_layer tests -selftests: netfilter: fix conntrack stress test failures on debug kernels -ice: Replace ice specific DSCP mapping num with a kernel define -iidc/ice/irdma: Break iidc.h into two headers -iidc/ice/irdma: Rename to iidc_* convention -iidc/ice/irdma: Rename IDC header file -batman-adv: Drop unused net_namespace.h include -batman-adv: Switch to crc32 header for crc32c -batman-adv: no need to start/stop queue on mesh-iface -batman-adv: constify and move broadcast addr definition -batman-adv: Start new development cycle