Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-03-08--03-00 (v6.14-rc5-1291-g6c2a93f27e71) remotes/brancher/net-next-2025-03-08--06-00 (v6.14-rc5-1296-g045a69dfc0d5) ==== BASE DIFF ==== .../devicetree/bindings/net/snps,dwmac.yaml | 4 + .../bindings/net/sophgo,sg2044-dwmac.yaml | 126 +++ MAINTAINERS | 2 +- drivers/bluetooth/Kconfig | 12 + drivers/bluetooth/btusb.c | 41 + drivers/net/dsa/mv88e6xxx/chip.c | 59 +- drivers/net/ethernet/Kconfig | 1 - drivers/net/ethernet/airoha/airoha_eth.c | 7 +- 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/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/mellanox/mlx5/core/devlink.c | 3 + drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 109 ++ drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 6 +- drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 13 + drivers/net/ethernet/stmicro/stmmac/Kconfig | 11 + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + 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 | 3 - .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 17 +- drivers/net/mctp/mctp-i2c.c | 5 + drivers/net/mctp/mctp-i3c.c | 5 + drivers/net/phy/nxp-c45-tja11xx.c | 68 ++ drivers/net/phy/nxp-tja11xx.c | 38 + drivers/net/phy/phylink.c | 18 - drivers/net/tun.c | 28 +- include/linux/netpoll.h | 1 + include/linux/phylink.h | 1 - include/net/bluetooth/hci_core.h | 108 +- include/net/tcp.h | 4 +- kernel/bpf/offload.c | 8 +- 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/core/dev.c | 3 + net/core/netpoll.c | 24 +- net/ethtool/netlink.c | 4 +- net/ipv4/tcp_diag.c | 21 +- net/mptcp/diag.c | 42 +- net/tls/tls_main.c | 4 +- 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 +- tools/testing/selftests/net/.gitignore | 1 + 54 files changed, 1594 insertions(+), 939 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.B8ezFST2BL b/tmp/tmp.WisQT6RaFw index f862f182aefa..32659544c977 100644 --- a/tmp/tmp.B8ezFST2BL +++ b/tmp/tmp.WisQT6RaFw @@ -3,6 +3,7 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +net: revert to lockless TC_SETUP_BLOCK and TC_SETUP_FT net: openvswitch: remove misbehaving actions length check net: move misc netdev_lock flavors to a separate header net: usb: lan78xx: Integrate EEE support with phylink LPI API @@ -12,7 +13,6 @@ net: usb: lan78xx: Use ethtool_op_get_link to reflect current link status net: usb: lan78xx: Improve error handling for PHY init path net: usb: lan78xx: Move fixed PHY cleanup to lan78xx_unbind() net: usb: lan78xx: Convert to PHYlink for improved PHY and MAC management -Merge tag 'for-net-2025-03-07' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth udp_tunnel: use static call for GRO hooks when possible udp_tunnel: create a fastpath GRO lookup. net: phylink: Use phy_caps to get an interface's capabilities and modes @@ -34,10 +34,6 @@ Documentation: netlink: specs: tc: Add DualPI2 specification net: hsr: Add KUnit test for PRP net: hsr: Fix PRP duplicate detection hamradio: use netdev_lockdep_set_classes() helper -net: drop rtnl_lock for queue_mgmt operations -net: add granular lock for the netdev netlink socket -net: protect net_devmem_dmabuf_bindings by new net_devmem_bindings_mutex -net: create netdev_nl_sock to wrap bindings list MAINTAINERS: sfc: remove Martin Habets net: cn23xx: fix typos net/mlx5: Avoid unnecessary use of comma operator @@ -83,62 +79,23 @@ xsc: Add xsc driver basic framework qlcnic: fix memory leak issues in qlcnic_sriov_common.c eth: fbnic: fix memory corruption in fbnic_tlv_attr_get_string() net: ethtool: tsinfo: Fix dump command -net: ethtool: use correct device pointer in ethnl_default_dump_one() -bpf: fix a possible NULL deref in bpf_map_offload_map_alloc() vsock/bpf: Handle EINTR connect() racing against sockmap update r8169: increase max jumbo packet size on RTL8125/RTL8126 -Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next selftests/net: expand cmsg_ip with MSG_MORE ipv6: save dontfrag in cork ipv6: remove leftover ip6 cookie initializer -selftests/net: add proc_net_pktgen to .gitignore net/mlx5: handle errors in mlx5_chains_create_table() -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 virtio_net: Use persistent NAPI config virtio-net: Map NAPIs to queues virtio-net: Refactor napi_disable paths virtio-net: Refactor napi_enable paths -gve: convert to use netmem for DQO RDA mode -net: stmmac: remove write-only priv->speed selftests/tc-testing: Add a test case for DRR class with TC_H_ROOT net_sched: Prevent creation of classes with TC_H_ROOT -netmem: prevent TX of unreadable skbs -net/mlx5: Fill out devlink dev info only for PFs -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: phylink: Remove unused phylink_init_eee -net: dsa: mv88e6xxx: Verify after ATU Load ops docs: netdev: add a note on selftest posting -eth: fbnic: support ring size configuration -eth: fbnic: fix typo in compile assert -eth: fbnic: link NAPIs to page pools -netpoll: hold rcu read lock in __netpoll_send_skb() -tcp: ulp: diag: more info without CAP_NET_ADMIN -tcp: ulp: diag: always print the name if any -net: airoha: Fix dev->dsa_ptr check in airoha_get_dsa_tag() -net: mctp i3c: Copy headers if cloned -ixgbe: Fix unreachable retry logic in combined and byte I2C write functions -net: ethernet: Remove accidental duplication in Kconfig file hinic3: module initialization and tx/rx logic rtase: Fix improper release of ring list entries in rtase_sw_reset selftests: bonding: fix incorrect mac address bonding: fix incorrect MAC address setting to receive NS messages -net: mctp i2c: Copy headers if cloned net: mctp: unshare packets when reassembling net-sysfs: fix NULL pointer dereference tcp: Pass flags to __tcp_send_ack @@ -167,18 +124,4 @@ enic: enic rq extended cq defines enic: enic rq code reorg enic: Move function from header file to c file tc-tests: Update tc police action tests for tc buffer size rounding fixes. -net: phy: tja11xx: enable PHY in sleep mode for TJA1102S -net: phy: tja11xx: add support for TJA1102S -netpoll: Optimize skb refilling on critical path net/smc: use the correct ndev to find pnetid by pnetid table -Revert "Bluetooth: hci_core: Fix sleeping function called from invalid context" -Bluetooth: hci_event: Fix enabling passive scanning -Bluetooth: SCO: fix sco_conn refcounting on sco_conn_ready -Bluetooth: btusb: Configure altsetting for HCI_USER_CHANNEL -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