Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-04-15--08-00 (v6.15-rc1-455-g0bc3426cb5c2) remotes/brancher/net-next-hw-2025-04-15--16-00 (v6.15-rc1-460-g97b9529e383c) ==== BASE DIFF ==== .../device_drivers/ethernet/meta/fbnic.rst | 49 ++ drivers/net/dsa/mt7530.c | 246 ++++++++-- drivers/net/dsa/mt7530.h | 42 ++ drivers/net/ethernet/meta/fbnic/fbnic.h | 3 + drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 34 ++ drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 178 ++++++- drivers/net/ethernet/meta/fbnic/fbnic_hw_stats.c | 335 ++++++++++++- drivers/net/ethernet/meta/fbnic/fbnic_hw_stats.h | 48 ++ drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 47 +- drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 1 + drivers/net/ethernet/qlogic/qed/qed.h | 1 - drivers/net/ethernet/qlogic/qed/qed_dbg_hsi.h | 31 -- drivers/net/ethernet/qlogic/qed/qed_debug.c | 25 - drivers/net/ethernet/qlogic/qed/qed_dev.c | 19 - drivers/net/ethernet/qlogic/qed/qed_hsi.h | 52 -- drivers/net/ethernet/qlogic/qed/qed_hw.c | 11 - drivers/net/ethernet/qlogic/qed/qed_hw.h | 9 - .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 138 ------ .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 25 +- drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 14 +- .../net/ethernet/stmicro/stmmac/dwmac-ingenic.c | 46 +- drivers/net/ethernet/wangxun/Kconfig | 4 +- drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 3 +- drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 2 +- drivers/net/mdio/Kconfig | 7 + drivers/net/mdio/Makefile | 1 + drivers/net/mdio/mdio-realtek-rtl9300.c | 522 +++++++++++++++++++++ drivers/net/phy/phy_device.c | 12 - include/linux/phy.h | 6 - include/net/mptcp.h | 13 +- include/net/netlink.h | 16 + net/core/fib_rules.c | 14 +- net/core/neighbour.c | 8 +- net/core/rtnetlink.c | 4 +- net/ipv6/addrconf.c | 8 +- net/mpls/af_mpls.c | 8 +- net/mptcp/mib.c | 1 + net/mptcp/mib.h | 1 + net/mptcp/pm.c | 5 +- net/mptcp/protocol.c | 4 +- net/mptcp/protocol.h | 1 + net/mptcp/sched.c | 35 +- net/mptcp/subflow.c | 12 +- net/ncsi/internal.h | 21 +- net/ncsi/ncsi-pkt.h | 23 +- net/ncsi/ncsi-rsp.c | 21 +- net/tipc/link.c | 2 +- net/tipc/node.c | 2 +- tools/testing/selftests/net/mptcp/mptcp_connect.c | 21 +- tools/testing/selftests/net/mptcp/mptcp_diag.c | 7 +- tools/testing/selftests/net/mptcp/mptcp_join.sh | 26 +- 51 files changed, 1628 insertions(+), 536 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.ApbWlK9Utg b/tmp/tmp.iyh1bexyIo index 22fb9e1e2b5c..7eb9ba14cec4 100644 --- a/tmp/tmp.ApbWlK9Utg +++ b/tmp/tmp.iyh1bexyIo @@ -4,6 +4,7 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +net: txgbe: fix memory leak in txgbe_probe() error path net: dsa: avoid refcount warnings when ds->ops->tag_8021q_vlan_del() fails net: dsa: free routing table on probe failure net: dsa: clean up FDB, MDB, VLAN entries on unbind @@ -16,41 +17,14 @@ amd-xgbe: Fix to ensure dependent features are toggled with RX checksum offload amd-xgbe: Fix data loss when RX checksum offloading is disabled net: bridge: locally receive all multicast packets if IFF_ALLMULTI is set octeon_ep_vf: Resolve netdevice usage count issue -net: stmmac: imx: use stmmac_pltfr_probe() -net: stmmac: anarion: use devm_stmmac_pltfr_probe() -net: stmmac: anarion: use stmmac_pltfr_probe() -net: stmmac: anarion: clean up interface parsing -net: stmmac: anarion: clean up anarion_config_dt() error handling net: wangxun: restrict feature flags for tunnel packets net: txgbe: Support to set UDP tunnel port net: ethernet: ti: am65-cpsw: handle -EPROBE_DEFER net: ethernet: ti: am65-cpsw: set fwnode for ports net: ethernet: ti: am65-cpsw: fix port_np reference counting rtase: Add ndo_setup_tc support for CBS offload in traffic control setup -net: txgbe: Update module description -selftests/tc-testing: Add test for HFSC queue emptying during peek operation -net_sched: hfsc: Fix a UAF vulnerability in class handling -qed: Remove unused qed_db_recovery_dp -qed: Remove unused qed_print_mcp_trace_* -qed: Remove unused qed_ptt_invalidate -qed: Remove unused qed_calc_*_ctx_validation functions -qed: Remove unused qed_memset_*ctx functions net: phy: remove redundant dependency on NETDEVICES for PHYLINK and PHYLIB -net: phy: remove device_phy_find_device -selftests: mptcp: use IPPROTO_MPTCP for getaddrinfo -selftests: mptcp: diag: drop nlh parameter of recv_nlmsg -selftests: mptcp: validate MPJoinRejected counter -mptcp: add MPJoinRejected MIB counter -mptcp: pass right struct to subflow_hmac_valid -mptcp: pm: Return local variable instead of freed pointer -mptcp: sched: split validation part -mptcp: sched: remove mptcp_sched_data -octeontx2-pf: fix potential double free in rvu_rep_create() net: ipconfig: replace strncpy with strscpy -net: ngbe: fix memory leak in ngbe_probe() error path -net: stmmac: leave enabling _RE and _TE to stmmac_mac_link_up() -net: stmmac: remove _RE and _TE in (start|stop)_(tx|rx)() methods -net: stmmac: call phylink_start() and phylink_stop() in XDP functions 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 @@ -65,28 +39,5 @@ 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 -tipc: Removing deprecated strncpy() -pds_core: make wait_context part of q_info -pds_core: Remove unnecessary check in pds_client_adminq_cmd() -pds_core: handle unsupported PDS_CORE_CMD_FW_CONTROL result -pds_core: remove extra name description -pds_core: Prevent possible adminq overflow/stuck condition -net: stmmac: starfive: Add serdes PHY init/deinit function tcp: tcp_acceptable_seq select SND.UNA when SND.WND is 0 -net: ncsi: Fix GCPS 64-bit member variables -net: dsa: mt7530: implement .get_stats64 -net: dsa: mt7530: move remaining MIB counter to define -net: dsa: mt7530: move pkt stats and err MIB counter to eth_mac stats API -net: dsa: mt7530: move pause MIB counter to eth_ctrl stats API -net: dsa: mt7530: move pkt size and rx err MIB counter to rmon stats API -net: dsa: mt7530: generalize read port stats logic -net: ipv6: ioam6: fix double reallocation -net: ipv6: ioam6: use consistent dst names -eth: fbnic: add support for TTI HW stats -eth: fbnic: add support for TMI stats -eth: fbnic: add coverage for RXB stats -eth: fbnic: add coverage for hw queue stats -eth: fbnic: add locking support for hw stats -net: mdio: Add RTL9300 MDIO driver tc: Return an error if filters try to attach too many actions -xsk: Fix race condition in AF_XDP generic RX path