Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-04-17--00-00 (v6.15-rc1-658-g21ff2eae1b71) remotes/brancher/net-next-2025-04-17--03-00 (v6.15-rc1-677-g2871d9839040) ==== BASE DIFF ==== Documentation/netlink/specs/rt-link.yaml | 20 +- Documentation/netlink/specs/rt-neigh.yaml | 14 +- Documentation/networking/devlink/devlink-info.rst | 4 + Documentation/networking/devlink/index.rst | 1 + Documentation/networking/devlink/ixgbe.rst | 122 ++ Documentation/networking/netdevices.rst | 2 +- drivers/net/dsa/b53/b53_common.c | 10 + drivers/net/dsa/mv88e6xxx/chip.c | 13 +- drivers/net/dsa/mv88e6xxx/devlink.c | 3 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 201 +-- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 3 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 1 + drivers/net/ethernet/intel/Kconfig | 2 + drivers/net/ethernet/intel/ixgbe/Makefile | 3 +- drivers/net/ethernet/intel/ixgbe/devlink/devlink.c | 557 +++++++ drivers/net/ethernet/intel/ixgbe/devlink/devlink.h | 10 + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 21 + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 56 +- drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c | 1512 ++++++++++++++++++-- drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h | 18 + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 86 +- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 12 +- drivers/net/ethernet/intel/ixgbe/ixgbe_fw_update.c | 707 +++++++++ drivers/net/ethernet/intel/ixgbe/ixgbe_fw_update.h | 12 + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 10 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 269 +++- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 16 +- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 5 + drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h | 161 ++- drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 2 +- drivers/net/ethernet/microchip/lan743x_main.c | 3 +- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 3 - drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 88 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 10 +- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 26 +- drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 3 +- drivers/net/phy/mediatek/mtk-ge-soc.c | 3 +- drivers/net/vxlan/vxlan_vnifilter.c | 5 +- drivers/ptp/ptp_ocp.c | 1 + include/net/page_pool/helpers.h | 11 + net/bridge/br_vlan.c | 4 +- net/core/dev.c | 2 + net/core/rtnetlink.c | 5 +- net/devlink/dev.c | 2 +- net/dsa/dsa.c | 59 +- net/dsa/tag_8021q.c | 2 +- net/ipv4/devinet.c | 4 +- net/ipv4/fib_frontend.c | 4 +- net/ipv4/ipmr.c | 8 +- net/ipv4/route.c | 4 +- net/ipv6/addrconf.c | 4 +- net/ipv6/addrlabel.c | 8 +- net/ipv6/route.c | 4 +- tools/net/ynl/pyynl/ynl_gen_c.py | 96 +- 59 files changed, 3727 insertions(+), 490 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.3vZIp0vCgO b/tmp/tmp.S04lVhVP0F index 0e12dd79e7f8..3f3711c70923 100644 --- a/tmp/tmp.3vZIp0vCgO +++ b/tmp/tmp.S04lVhVP0F @@ -7,9 +7,17 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +selftests: drv-net: Test that NAPI ID is non-zero +selftests: net: Allow custom net ns paths +selftests: drv-net: Factor out ksft C helpers +netdevsim: Mark NAPI ID on skb in nsim_rcv +emulex/benet: Annotate flash_cookie as nonstring net: phylink: mac_link_(up|down)() clarifications Merge tag 'for-net-2025-04-16' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth -batman-adv: fix duplicate MAC address check +net: ibmveth: added KUnit tests for some buffer pool functions +net: ibmveth: Reset the adapter when unexpected states are detected +net: ibmveth: Indented struct ibmveth_adapter correctly +net: add UAPI to the header guard in various network headers net: phy: dp83822: Add support for changing the MAC termination net: phy: Add helper for getting MAC termination resistance dt-bindings: net: dp83822: add constraints for mac-termination-ohms @@ -27,7 +35,6 @@ net: lwtunnel: disable BHs when required net: selftests: initialize TCP header and skb payload with zero net: phylink: Fix issues with link balancing w/ BMC present net: phylink: Drop unused defines for SUPPORTED/ADVERTISED_INTERFACES -bnxt_en: improve TX timestamping FIFO configuration net: stmmac: dwmac-loongson: Add new GMAC's PCI device ID support net: stmmac: dwmac-loongson: Add new multi-chan IP core support net: stmmac: dwmac-loongson: Move queue number init to common function @@ -93,39 +100,10 @@ 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 -ixgbe: add support for FW rollback mode -ixgbe: add E610 implementation of FW recovery mode -ixgbe: add FW API version check -ixgbe: add support for devlink reload -ixgbe: add device flash update via devlink -ixgbe: extend .info_get() with stored versions -ixgbe: add E610 functions getting PBA and FW ver info -ixgbe: add .info_get extension specific for E610 devices -ixgbe: read the netlist version information -ixgbe: read the OROM version information -ixgbe: add E610 functions for acquiring flash data -ixgbe: add handler for devlink .info_get() -ixgbe: add initial devlink support -ixgbe: wrap netdev_priv() usage -devlink: add value check to devlink_info_version_put() net: phy: remove checks for unused eee-broken flags dt-bindings: net: ethernet-phy: remove eee-broken flags which have never had a user r8169: add RTL_GIGA_MAC_VER_LAST to facilitate adding support for new chip versions -vxlan: Use nlmsg_payload in vxlan_vnifilter_dump -ipv4: Use nlmsg_payload in ipmr file -ipv4: Use nlmsg_payload in route file -ipv4: Use nlmsg_payload in fib_frontend file -ipv4: Use nlmsg_payload in devinet file -ipv6: Use nlmsg_payload in route file -ipv6: Use nlmsg_payload in addrconf file -ipv6: Use nlmsg_payload in addrlabel file r8169: refactor chip version detection -docs: networking: clarify intended audience of netdevices.rst -net: stmmac: sti: convert to stmmac_pltfr_pm_ops -net: stmmac: sti: convert to devm_stmmac_pltfr_probe() -net: stmmac: sti: use phy_interface_mode_is_rgmii() -net: don't try to ops lock uninitialized devs -amd-xgbe: Add device IDs for Hygon 10Gb ethernet controller net: stmmac: sunxi: use devm_stmmac_pltfr_probe() net: stmmac: sunxi: use stmmac_pltfr_probe() net: stmmac: sunxi: convert to set_clk_tx_rate() @@ -177,9 +155,6 @@ ovpn: keep carrier always on for MP interfaces ovpn: add basic interface creation/destruction/management routines ovpn: add basic netlink support net: introduce OpenVPN Data Channel Offload (ovpn) -net: phy: mediatek: init val in .phy_led_polarity_set for AN7581 -net: stmmac: sun8i: use stmmac_pltfr_probe() -net: stmmac: intel: remove unnecessary setting max_speed net: ti: icss-iep: Fix possible NULL pointer dereference for perout request net: ti: icssg-prueth: Fix possible NULL pointer dereference inside emac_xmit_xdp_frame() net: ti: icssg-prueth: Fix kernel warning while bringing down network interface @@ -187,19 +162,6 @@ net: ethtool: phy: Convert the PHY_GET command to generic phy dump net: ethtool: Introduce per-PHY DUMP operations net: airoha: Add missing filed to ppe_mbox_data struct net: airoha: Add matchall filter offload support -ptp: ocp: fix start time alignment in ptp_ocp_signal_set -eth: bnxt: add support rx side device memory TCP -net: lan743x: Allocate rings outside ZONE_DMA -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 -net: dsa: mv88e6xxx: fix -ENOENT when deleting VLANs and MST is unsupported -net: dsa: mv88e6xxx: avoid unregistering devlink regions which were never registered -net: b53: enable BPDU reception for management port -net: bridge: switchdev: do not notify new brentries as changed -xen-netfront: handle NULL returned by xdp_convert_buff_to_frame() -cxgb4: fix memory leak in cxgb4_init_ethtool_filters() error path rds: Use nested-BH locking for rds_page_remainder rds: Acquire per-CPU pointer within BH disabled section rds: Disable only bottom halves in rds_page_remainder_alloc() @@ -218,7 +180,5 @@ ipv6: sr: Use nested-BH locking for hmac_storage ipv4/route: Use this_cpu_inc() for stats on PREEMPT_RT net: dst_cache: Use nested-BH locking for dst_cache::cache net: page_pool: Don't recycle into cache on PREEMPT_RT -net: ethernet: ti: am65-cpsw: handle -EPROBE_DEFER -net: ethernet: ti: am65-cpsw: set fwnode for ports Bluetooth: vhci: Avoid needless snprintf() calls Bluetooth: l2cap: Process valid commands in too long frame