Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-01-08--00-00 (v6.13-rc5-983-g1c31f0441908) remotes/brancher/net-next-2025-01-08--03-00 (v6.13-rc5-991-gcb0f408aeb57) ==== BASE DIFF ==== Documentation/netlink/specs/rt_link.yaml | 93 ++++ .../device_drivers/ethernet/intel/i40e.rst | 12 + drivers/net/dsa/b53/b53_common.c | 7 - drivers/net/dsa/b53/b53_priv.h | 1 - drivers/net/dsa/bcm_sf2.c | 1 - drivers/net/dsa/microchip/ksz_common.c | 15 - drivers/net/dsa/mt7530.c | 13 - drivers/net/dsa/mv88e6xxx/chip.c | 8 - drivers/net/dsa/qca/qca8k-8xxx.c | 1 - drivers/net/dsa/qca/qca8k-common.c | 7 - drivers/net/dsa/qca/qca8k.h | 1 - drivers/net/ethernet/freescale/ucc_geth.c | 2 +- drivers/net/ethernet/google/gve/gve_main.c | 14 +- drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 120 ----- drivers/net/ethernet/intel/fm10k/fm10k_pf.h | 2 - drivers/net/ethernet/intel/i40e/i40e.h | 4 +- drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 + drivers/net/ethernet/intel/i40e/i40e_main.c | 107 +++- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 11 +- drivers/net/ethernet/intel/igb/Makefile | 2 +- drivers/net/ethernet/intel/igb/igb.h | 58 ++- drivers/net/ethernet/intel/igb/igb_main.c | 270 ++++++---- drivers/net/ethernet/intel/igb/igb_xsk.c | 562 +++++++++++++++++++++ drivers/net/ethernet/intel/igc/igc.h | 2 + drivers/net/ethernet/intel/igc/igc_main.c | 79 ++- drivers/net/ethernet/intel/igc/igc_xdp.c | 8 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 23 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 1 - drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 23 +- drivers/net/ethernet/intel/ixgbevf/mbx.c | 12 - drivers/net/netkit.c | 66 ++- include/linux/if_vlan.h | 13 +- include/linux/netdevice.h | 2 +- include/net/dsa.h | 2 - include/uapi/linux/if_link.h | 2 + net/core/dev.c | 43 +- net/core/link_watch.c | 10 +- net/dsa/user.c | 8 - net/sched/sch_generic.c | 33 +- net/tls/tls_sw.c | 2 +- tools/include/uapi/linux/if_link.h | 2 + tools/net/ynl/lib/nlspec.py | 5 +- tools/net/ynl/lib/ynl.py | 74 +-- tools/net/ynl/ynl-gen-c.py | 26 +- tools/testing/selftests/bpf/Makefile | 1 - tools/testing/selftests/bpf/prog_tests/tc_netkit.c | 49 +- .../bpf/prog_tests/xdp_context_test_run.c | 87 ++++ tools/testing/selftests/bpf/progs/test_tc_link.c | 15 + tools/testing/selftests/bpf/progs/test_xdp_meta.c | 4 +- tools/testing/selftests/bpf/test_xdp_meta.sh | 58 --- tools/testing/selftests/bpf/xdp_hw_metadata.c | 3 +- 53 files changed, 1418 insertions(+), 552 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.ms1UlQGdo1 b/tmp/tmp.uOjFF6iPuB index ff39ed0f3227..3491fd533d76 100644 --- a/tmp/tmp.ms1UlQGdo1 +++ b/tmp/tmp.uOjFF6iPuB @@ -12,7 +12,6 @@ net: phy: micrel: use helper phy_disable_eee igc: return early when failing to read EECD register ice: fix incorrect PHY settings for 100 GB/s ice: fix max values for dpll pin phase adjust -net: Silence false field-spanning write warning in ip_tunnel_info_opts_set() memcpy net: stmmac: remove stmmac_lpi_entry_timer_config() net: stmmac: split hardware LPI timer control net: stmmac: remove unnecessary EEE handling in stmmac_release() @@ -49,7 +48,6 @@ net: gro: expose GRO init/cleanup to use outside of NAPI net: gro: decouple GRO from the NAPI layer net: hsr: remove synchronize_rcu() from hsr_add_port() net: no longer reset transport_header in __netif_receive_skb_core() -Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next dt-bindings: net: Correct indentation and style in DTS example netlink: add IPv6 anycast join/leave notifications net/mlx5: use do_aux_work for PHC overflow checks @@ -59,14 +57,9 @@ net: stmmac: Unexport stmmac_rx_offset() from stmmac.h r8169: add support for RTL8125BP rev.b mctp i3c: fix MCTP I3C driver multi-thread issue selftests: drv-net: test drivers sleeping in ndo_get_stats64 -netlink: specs: rt_link: decode ip6tnl, vti and vti6 link attrs -tools: ynl: print some information about attribute we can't parse -tools: ynl: correctly handle overrides of fields in subset netdev: prevent accessing NAPI instances from another namespace r8169: add support for reading over-temp threshold r8169: prepare for extending hwmon support -eth: gve: use appropriate helper to set xdp_features -if_vlan: fix kdoc warnings MAINTAINERS: remove Lars Povlsen from Microchip Sparx5 SoC MAINTAINERS: remove Noam Dagan from AMAZON ETHERNET MAINTAINERS: remove Ying Xue from TIPC @@ -83,34 +76,9 @@ net: hns3: don't auto enable misc vector net: hns3: Resolved the issue that the debugfs query result is inconsistent. net: hns3: fix missing features due to dev->features configuration too early net: hns3: fixed reset failure issues caused by the incorrect reset type -net: dsa: remove get_mac_eee() method -net: dsa: qca: remove qca8k_get_mac_eee() -net: dsa: mv88e6xxx: remove mv88e6xxx_get_mac_eee() -net: dsa: mt753x: remove ksz_get_mac_eee() -net: dsa: ksz: remove ksz_get_mac_eee() -net: dsa: b53/bcm_sf2: remove b53_get_mac_eee() -net: dsa: no longer call ds->ops->get_mac_eee() -net: dsa: mt753x: remove setting of tx_lpi parameters -net: dsa: ksz: remove setting of tx_lpi parameters -ipvlan: Fix use-after-free in ipvlan_get_iflink(). -net: Hold rtnl_net_lock() in (un)?register_netdevice_notifier_dev_net(). -net: Hold rtnl_net_lock() in (un)?register_netdevice_notifier_net(). -net: Hold __rtnl_net_lock() in (un)?register_netdevice_notifier(). page_pool: check for dma_sync_size earlier net: wwan: iosm: Fix hibernation by re-binding the driver around it -ixgbevf: Remove unused ixgbevf_hv_mbx_ops -wireguard: use rhashtables instead of hashtables -net: watchdog: rename __dev_watchdog_up() and dev_watchdog_down() -net: ethtool: Use hwprov under rcu_read_lock netlink: support dumping IPv4 multicast addresses -usbnet: ipheth: document scope of NCM implementation -usbnet: ipheth: fix DPE OoB read -usbnet: ipheth: refactor NCM datagram loop -usbnet: ipheth: use static NDP16 location in URB -usbnet: ipheth: check that DPE points past NCM header -usbnet: ipheth: fix possible overflow in DPE length check -usbnet: ipheth: break up NCM header size computation -ipvlan: Support bonding events net: pse-pd: Fix missing PI of_node description regulator: core: Resolve supply using of_node from regulator_config net: ethtool: Add support for new PSE device index description @@ -125,17 +93,8 @@ net: pse-pd: tps23881: Simplify function returns by removing redundant checks net: pse-pd: Add power limit check net: pse-pd: Avoid setting max_uA in regulator constraints net: pse-pd: Remove unused pse_ethtool_get_pw_limit function declaration -tls: Fix tls_sw_sendmsg error handling net/smc: fix data error when recvmsg with MSG_PEEK flag net: ti: icssg-prueth: Add Support for Multicast filtering with VLAN in HSR mode net: ti: icssg-prueth: Add Multicast Filtering support for VLAN in MAC mode net: ti: icssg-prueth: Add VLAN support in EMAC mode net/smc: use the correct ndev to find pnetid by pnetid table -selftests/bpf: Extend netkit tests to validate set {head,tail}room -netkit: Add add netkit {head,tail}room to rt_link.yaml -netkit: Allow for configuring needed_{head,tail}room -Merge branch 'selftests-bpf-migrate-test_xdp_meta-sh-to-test_progs' -selftests/bpf: Migrate test_xdp_meta.sh into xdp_context_test_run.c -selftests/bpf: test_xdp_meta: Rename BPF sections -selftests/bpf: Enable Tx hwtstamp in xdp_hw_metadata -selftests/bpf: Actuate tx_metadata_len in xdp_hw_metadata