Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-03-12--16-00 (v6.14-rc5-1310-g91a9f07673ee) remotes/brancher/net-next-hw-2025-03-13--00-00 (v6.14-rc5-1258-gbb8a510631b8) ==== BASE DIFF ==== .../devicetree/bindings/net/snps,dwmac.yaml | 9 +- .../bindings/net/sophgo,sg2044-dwmac.yaml | 126 -- .../devicetree/bindings/net/tesla,fsd-ethqos.yaml | 118 -- Documentation/process/maintainer-netdev.rst | 8 - MAINTAINERS | 40 +- drivers/bluetooth/Kconfig | 12 - drivers/bluetooth/btusb.c | 41 - drivers/net/bonding/bond_main.c | 1 - drivers/net/bonding/bond_options.c | 55 +- drivers/net/dsa/mv88e6xxx/chip.c | 59 +- drivers/net/dummy.c | 1 - drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/airoha/airoha_eth.c | 107 +- drivers/net/ethernet/airoha/airoha_eth.h | 3 +- drivers/net/ethernet/airoha/airoha_regs.h | 5 - drivers/net/ethernet/broadcom/bnxt/bnxt.c | 26 +- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 14 +- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 3 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1089 ++++++----- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 52 +- drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 89 +- drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 +- drivers/net/ethernet/cisco/enic/Makefile | 2 +- drivers/net/ethernet/cisco/enic/cq_desc.h | 25 +- drivers/net/ethernet/cisco/enic/cq_enet_desc.h | 142 +- drivers/net/ethernet/cisco/enic/enic.h | 13 - drivers/net/ethernet/cisco/enic/enic_ethtool.c | 12 +- drivers/net/ethernet/cisco/enic/enic_main.c | 69 +- drivers/net/ethernet/cisco/enic/enic_res.c | 87 +- drivers/net/ethernet/cisco/enic/enic_res.h | 11 +- drivers/net/ethernet/cisco/enic/enic_rq.c | 240 +-- drivers/net/ethernet/cisco/enic/enic_rq.h | 6 +- drivers/net/ethernet/cisco/enic/enic_wq.c | 117 -- drivers/net/ethernet/cisco/enic/enic_wq.h | 7 - drivers/net/ethernet/cisco/enic/vnic_cq.h | 45 +- drivers/net/ethernet/cisco/enic/vnic_devcmd.h | 19 - drivers/net/ethernet/cisco/enic/vnic_enet.h | 5 - drivers/net/ethernet/cisco/enic/vnic_rq.h | 2 +- drivers/net/ethernet/cisco/enic/vnic_wq.h | 2 +- drivers/net/ethernet/google/gve/gve.h | 8 +- .../net/ethernet/google/gve/gve_buffer_mgmt_dqo.c | 27 +- drivers/net/ethernet/google/gve/gve_rx_dqo.c | 34 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 1 - drivers/net/ethernet/intel/ice/ice_arfs.c | 2 +- drivers/net/ethernet/intel/ice/ice_eswitch.c | 6 + drivers/net/ethernet/intel/ice/ice_lag.c | 27 - drivers/net/ethernet/intel/ice/ice_lib.c | 18 + drivers/net/ethernet/intel/ice/ice_lib.h | 4 + drivers/net/ethernet/intel/ice/ice_main.c | 4 +- drivers/net/ethernet/intel/ice/ice_txrx.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 3 - drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 9 +- .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 81 +- .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 35 +- .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 95 +- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 47 +- .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 4 + .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 5 - .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 92 - drivers/net/ethernet/mellanox/mlx5/core/port.c | 168 +- drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 109 -- drivers/net/ethernet/meta/fbnic/fbnic_tlv.c | 2 +- drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 6 +- drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 13 - drivers/net/ethernet/microsoft/mana/mana_en.c | 1 - .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 8 +- drivers/net/ethernet/realtek/r8169_main.c | 4 - drivers/net/ethernet/realtek/rtase/rtase_main.c | 10 - drivers/net/ethernet/stmicro/stmmac/Kconfig | 11 - drivers/net/ethernet/stmicro/stmmac/Makefile | 1 - .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 8 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c | 75 - drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 38 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 17 +- drivers/net/ethernet/ti/Kconfig | 1 - drivers/net/ethernet/ti/icssg/icss_iep.c | 63 +- drivers/net/ethernet/ti/icssg/icssg_common.c | 417 +---- drivers/net/ethernet/ti/icssg/icssg_prueth.c | 131 +- drivers/net/ethernet/ti/icssg/icssg_prueth.h | 47 +- drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c | 58 +- drivers/net/geneve.c | 1 - drivers/net/hamradio/bpqether.c | 25 +- drivers/net/hyperv/netvsc_drv.c | 1 - drivers/net/ipvlan/ipvlan_main.c | 1 - drivers/net/loopback.c | 1 - drivers/net/macsec.c | 1 - drivers/net/macvlan.c | 1 - drivers/net/mctp/mctp-i2c.c | 5 - drivers/net/mctp/mctp-i3c.c | 5 - drivers/net/netdevsim/netdev.c | 1 - drivers/net/phy/nxp-c45-tja11xx.c | 68 - drivers/net/phy/nxp-tja11xx.c | 38 - drivers/net/phy/phylink.c | 18 + drivers/net/ppp/ppp_generic.c | 1 - drivers/net/team/team_core.c | 1 - drivers/net/tun.c | 28 +- drivers/net/usb/lan78xx.c | 4 +- drivers/net/veth.c | 1 - drivers/net/virtio_net.c | 101 +- drivers/net/vrf.c | 1 - drivers/net/vxlan/vxlan_core.c | 1 - drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 2 - drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 6 +- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 11 +- drivers/ptp/ptp_ocp.c | 3 + include/linux/ipv6.h | 1 - include/linux/mlx5/port.h | 85 +- include/linux/netdevice.h | 81 +- include/linux/netpoll.h | 1 - include/linux/phylink.h | 1 + include/net/bluetooth/hci_core.h | 108 +- include/net/inet_hashtables.h | 4 +- include/net/ip.h | 2 +- include/net/netdev_lock.h | 89 - include/net/netfilter/nf_tables.h | 4 +- include/net/tcp.h | 4 +- kernel/bpf/offload.c | 9 +- net/8021q/vlan_dev.c | 1 - net/bluetooth/6lowpan.c | 1 - net/bluetooth/hci_core.c | 10 +- net/bluetooth/hci_event.c | 37 +- net/bluetooth/iso.c | 6 + net/bluetooth/l2cap_core.c | 12 +- net/bluetooth/rfcomm/core.c | 6 + net/bluetooth/sco.c | 25 +- net/bridge/br_device.c | 2 - net/core/dev.c | 4 - net/core/dev.h | 1 - net/core/dev_api.c | 2 - net/core/dev_ioctl.c | 1 - net/core/devmem.c | 4 +- net/core/net-sysfs.c | 1 - net/core/netpoll.c | 24 +- net/core/rtnetlink.c | 1 - net/dsa/conduit.c | 1 - net/ethtool/cabletest.c | 1 - net/ethtool/cmis_fw_update.c | 1 - net/ethtool/features.c | 2 - net/ethtool/ioctl.c | 1 - net/ethtool/module.c | 1 - net/ethtool/netlink.c | 5 +- net/ethtool/phy.c | 1 - net/ethtool/rss.c | 2 - net/ethtool/tsinfo.c | 4 +- net/ieee802154/6lowpan/core.c | 1 - net/ipv4/inet_hashtables.c | 67 +- net/ipv4/ip_tunnel.c | 1 - net/ipv4/tcp.c | 12 +- net/ipv4/tcp_diag.c | 21 +- net/ipv4/udp.c | 6 +- net/ipv6/inet6_hashtables.c | 19 +- net/ipv6/ip6_gre.c | 1 - net/ipv6/ip6_output.c | 11 +- net/ipv6/ip6_tunnel.c | 1 - net/ipv6/ip6_vti.c | 1 - net/ipv6/sit.c | 1 - net/ipv6/udp.c | 2 +- net/l2tp/l2tp_eth.c | 1 - net/mac80211/eht.c | 9 +- net/mac80211/rx.c | 10 +- net/mac80211/sta_info.c | 20 +- net/mac80211/util.c | 8 +- net/mctp/route.c | 10 +- net/mctp/test/route-test.c | 109 -- net/mptcp/Makefile | 2 +- net/mptcp/diag.c | 42 +- net/mptcp/pm.c | 657 ++----- net/mptcp/pm_kernel.c | 1410 -------------- net/mptcp/pm_netlink.c | 1919 +++++++++++++++++++- net/mptcp/pm_userspace.c | 28 +- net/mptcp/protocol.c | 5 +- net/mptcp/protocol.h | 42 +- net/netfilter/nf_conncount.c | 4 +- net/netfilter/nf_tables_api.c | 24 +- net/netfilter/nft_compat.c | 8 +- net/netfilter/nft_ct.c | 6 +- net/sched/sch_api.c | 1 - net/sched/sch_gred.c | 3 +- net/switchdev/switchdev.c | 25 +- net/tls/tls_main.c | 4 +- net/wireless/core.c | 7 - net/wireless/nl80211.c | 12 +- net/xdp/xsk.c | 1 - net/xdp/xsk_buff_pool.c | 1 - tools/testing/selftests/bpf/network_helpers.c | 28 - tools/testing/selftests/bpf/network_helpers.h | 3 - .../testing/selftests/bpf/prog_tests/lwt_helpers.h | 29 + .../bpf/prog_tests/xdp_context_test_run.c | 145 +- tools/testing/selftests/bpf/progs/test_xdp_meta.c | 53 +- .../selftests/drivers/net/bonding/bond_options.sh | 4 +- tools/testing/selftests/drivers/net/ping.py | 194 +- tools/testing/selftests/net/.gitignore | 1 - tools/testing/selftests/net/bpf_offload.py | 5 +- tools/testing/selftests/net/cmsg_ip.sh | 11 +- tools/testing/selftests/net/cmsg_sender.c | 24 +- tools/testing/selftests/net/config | 2 - tools/testing/selftests/net/lib/xdp_dummy.bpf.c | 6 - .../selftests/net/openvswitch/openvswitch.sh | 11 +- 199 files changed, 4003 insertions(+), 6261 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.G7mW57WJJH b/tmp/tmp.r95mKFD98v index c7b6a4a88064..a5abd0731bf3 100644 --- a/tmp/tmp.G7mW57WJJH +++ b/tmp/tmp.r95mKFD98v @@ -20,10 +20,7 @@ net: mvpp2: Add metadata support for xdp mode net: mvneta: Add metadata support for xdp mode net-next: cdc_ether|r8152: ThinkPad Hybrid USB-C/A Dock quirk net: mana: cleanup mana struct after debugfs_remove() -netdevsim: 'support' multi-buf XDP rndis_host: Flag RNDIS modems as WWAN devices -net: reorder dev_addr_sem lock -Revert "net: replace dev_addr_sem with netdev instance lock" qed: remove cast to pointers passed to kfree net: bcmgenet: use genphy_c45_eee_is_active directly, instead of phy_init_eee MAINTAINERS: add new file ntmp.h to ENETC driver @@ -41,11 +38,9 @@ net: enetc: move generic MAC filterng 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 net: ethernet: mediatek: Fix bit field in mtk_set_queue_speed() -ipvs: prevent integer overflow in do_ip_vs_get_ctl() net: stmmac: dwmac-rk: Remove unneeded GRF and peripheral GRF checks net: stmmac: dwmac-rk: Validate GRF and peripheral GRF during probe dt-bindings: net: rockchip-dwmac: Require rockchip,grf and rockchip,php-grf -net: revert to lockless TC_SETUP_BLOCK and TC_SETUP_FT net: openvswitch: remove misbehaving actions length check net: phylink: Use phy_caps to get an interface's capabilities and modes net: phylink: Convert capabilities to linkmodes using phy_caps @@ -62,5 +57,138 @@ net: phy: Use an internal, searchable storage for the linkmodes net: ethtool: Export the link_mode_params definitions net: hsr: Add KUnit test for PRP net: hsr: Fix PRP duplicate detection -selftests/tc-testing: Add a test case for DRR class with TC_H_ROOT -net_sched: Prevent creation of classes with TC_H_ROOT +netdevsim: 'support' multi-buf XDP +Merge branch 'net-remove-rtnl_lock-from-the-callers-of-queue-apis' +net: drop rtnl_lock for queue_mgmt operations +net: add granular lock for the netdev netlink socket +net: create netdev_nl_sock to wrap bindings list +net/mlx5: Avoid unnecessary use of comma operator +selftests: net: bump GRO timeout for gro/setup_veth +eth: bnxt: add missing netdev lock management to bnxt_dl_reload_up +eth: bnxt: request unconditional ops lock +eth: bnxt: switch to netif_close +net: revert to lockless TC_SETUP_BLOCK and TC_SETUP_FT +docs: netdev: add a note on selftest posting +Merge branch 'net-ti-icssg-prueth-add-native-mode-xdp-support' +net: ti: icssg-prueth: Add XDP support +net: ti: icssg-prueth: introduce and use prueth_swdata struct for SWDATA +net: ti: icssg-prueth: Use page_pool API for RX buffer allocation +Merge branch 'enic-enable-32-64-byte-cqes-and-get-max-rx-tx-ring-size-from-hw' +enic: get max rq & wq entries supported by hw, 16K queues +enic: cleanup of enic wq request completion path +enic: added enic_wq.c and enic_wq.h +enic: remove unused function cq_enet_wq_desc_dec +enic: enable rq extended cq support +enic: enic rq extended cq defines +enic: enic rq code reorg +enic: Move function from header file to c file +Merge branch 'mptcp-pm-code-reorganisation' +mptcp: pm: move Netlink PM helpers to pm_netlink.c +mptcp: pm: split in-kernel PM specific code +mptcp: pm: move generic PM helpers to pm.c +mptcp: pm: move generic helper at the top +mptcp: pm: export mptcp_remote_address +mptcp: pm: worker: split in-kernel and common tasks +mptcp: pm: avoid calling PM specific code from core +mptcp: pm: kernel: add '_pm' to mptcp_nl_set_flags +mptcp: pm: remove '_nl' from mptcp_pm_nl_is_init_remote_addr +mptcp: pm: remove '_nl' from mptcp_pm_nl_subflow_chk_stale() +mptcp: pm: remove '_nl' from mptcp_pm_nl_rm_addr_received +mptcp: pm: remove '_nl' from mptcp_pm_nl_work +mptcp: pm: remove '_nl' from mptcp_pm_nl_mp_prio_send_ack +mptcp: pm: remove '_nl' from mptcp_pm_nl_addr_send_ack +mptcp: pm: use addr entry for get_local_id +eth: fbnic: fix memory corruption in fbnic_tlv_attr_get_string() +r8169: increase max jumbo packet size on RTL8125/RTL8126 +Merge branch 'follow-up-on-deduplicate-cookie-logic' +selftests/net: expand cmsg_ip with MSG_MORE +ipv6: save dontfrag in cork +ipv6: remove leftover ip6 cookie initializer +Merge branch 'virtio-net-link-queues-to-napis' +virtio_net: Use persistent NAPI config +virtio-net: Map NAPIs to queues +virtio-net: Refactor napi_disable paths +virtio-net: Refactor napi_enable paths +net: move misc netdev_lock flavors to a separate header +hamradio: use netdev_lockdep_set_classes() helper +udp: expand SKB_DROP_REASON_UDP_CSUM use +netpoll: Optimize skb refilling on critical path +Merge branch 'net-phy-tja11xx-add-support-for-tja1102s' +net: phy: tja11xx: enable PHY in sleep mode for TJA1102S +net: phy: tja11xx: add support for TJA1102S +net: ethernet: Remove accidental duplication in Kconfig file +MAINTAINERS: adjust entry in AIROHA ETHERNET DRIVER +net: airoha: Fix dev->dsa_ptr check in airoha_get_dsa_tag() +Merge branch 'tcp-ulp-diag-expose-more-to-non-net-admin-users' +tcp: ulp: diag: more info without CAP_NET_ADMIN +tcp: ulp: diag: always print the name if any +Merge branch 'eth-fbnic-support-ring-size-configuration' +eth: fbnic: support ring size configuration +eth: fbnic: fix typo in compile assert +eth: fbnic: link NAPIs to page pools +Merge branch 'net-bcmgenet-revise-suspend-resume' +net: bcmgenet: revise suspend/resume +net: bcmgenet: allow return of power up status +net: bcmgenet: move bcmgenet_power_up into resume_noirq +net: bcmgenet: support reclaiming unsent Tx packets +net: bcmgenet: introduce bcmgenet_[r|t]dma_disable +net: bcmgenet: consolidate dma initialization +net: bcmgenet: remove dma_ctrl argument +net: bcmgenet: add support for RX_CLS_FLOW_DISC +net: bcmgenet: move DESC_INDEX flow to ring 0 +net: bcmgenet: extend bcmgenet_hfb_* API +net: bcmgenet: BCM7712 is GENETv5 compatible +net: bcmgenet: move feature flags to bcmgenet_priv +net: bcmgenet: add bcmgenet_has_* helpers +net: bcmgenet: bcmgenet_hw_params clean up +net: stmmac: remove write-only priv->speed +gve: convert to use netmem for DQO RDA mode +net: ethtool: use correct device pointer in ethnl_default_dump_one() +bpf: fix a possible NULL deref in bpf_map_offload_map_alloc() +Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next +selftests/net: add proc_net_pktgen to .gitignore +Merge branch 'riscv-sophgo-add-ethernet-support-for-sg2044' +net: stmmac: Add glue layer for Sophgo SG2044 SoC +net: stmmac: platform: Add snps,dwmac-5.30a IP compatible string +net: stmmac: platform: Group GMAC4 compatible check +dt-bindings: net: Add support for Sophgo SG2044 dwmac +net: phylink: Remove unused phylink_init_eee +Merge branch 'mlx5-misc-enhancements-2025-03-04' +net/mlx5e: Properly match IPsec subnet addresses +net/mlx5e: Separate address related variables to be in struct +net/mlx5: Lag, Enable Multiport E-Switch offloads on 8 ports LAG +net/mlx5e: Enable lanes configuration when auto-negotiation is off +net/mlx5: Refactor link speed handling with mlx5_link_info struct +net/mlx5: Relocate function declarations from port.h to mlx5_core.h +Merge branch 'add-perout-configuration-support-in-iep-driver' +net: ti: icss-iep: Add phase offset configuration for perout signal +net: ti: icss-iep: Add pwidth configuration for perout signal +selftests: openvswitch: don't hardcode the drop reason subsys +net: airoha: Enable TSO/Scatter Gather for LAN port +net: airoha: Fix lan4 support in airoha_qdma_get_gdm_port() +Merge branch 'increase-maximum-mtu-to-9k-for-airoha-en7581-soc' +net: airoha: Increase max mtu to 9k +net: airoha: Introduce airoha_dev_change_mtu callback +net: airoha: Enable Rx Scatter-Gather +net: airoha: Move min/max packet len configuration in airoha_dev_open() +net: stmmac: simplify phylink_suspend() and phylink_resume() calls +net: stmmac: avoid shadowing global buf_sz +selftests: net: bpf_offload: add 'libbpf_global' to ignored maps +selftests: net: fix error message in bpf_offload +tcp: clamp window like before the cleanup +net: stmmac: mostly remove "buf_sz" +ptp: ocp: Remove redundant check in _signal_summary_show +Merge branch 'net-stmmac-dwc-qos-add-fsd-eqos-support' +net: stmmac: dwc-qos: Add FSD EQoS support +dt-bindings: net: Add FSD EQoS device tree bindings +Merge branch 'tcp-even-faster-connect-under-stress' +inet: call inet6_ehashfn() once from inet6_hash_connect() +inet: change lport contribution to inet_ehashfn() and inet6_ehashfn() +tcp: bring back NUMA dispersion in inet_ehash_locks_alloc() +Merge branch 'xdp-metadata-support-for-tun-driver' +selftests/bpf: Fix file descriptor assertion in open_tuntap helper +selftests/bpf: Add test for XDP metadata support in tun driver +selftests/bpf: Refactor xdp_context_functional test and bpf program +selftests/bpf: Move open_tuntap to network helpers +net: tun: Enable transfer of XDP metadata to skb +net: tun: Enable XDP metadata support