Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-02-20--21-00 (v6.14-rc3-750-gbfdaed29b490) remotes/brancher/net-next-2025-02-21--00-00 (v6.14-rc3-736-gbbb0ffa2a1fa) ==== BASE DIFF ==== drivers/net/ethernet/meta/fbnic/fbnic.h | 3 + drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 60 ++ drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 4 + drivers/net/ethernet/meta/fbnic/fbnic_netdev.h | 6 + drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 53 +- drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 3 + drivers/net/ethernet/wangxun/Kconfig | 1 + drivers/net/ethernet/wangxun/libwx/Makefile | 2 +- drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 53 ++ drivers/net/ethernet/wangxun/libwx/wx_ethtool.h | 4 + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 19 + drivers/net/ethernet/wangxun/libwx/wx_hw.h | 1 + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 52 +- drivers/net/ethernet/wangxun/libwx/wx_ptp.c | 883 +++++++++++++++++++++ drivers/net/ethernet/wangxun/libwx/wx_ptp.h | 20 + drivers/net/ethernet/wangxun/libwx/wx_type.h | 105 +++ drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c | 2 + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 20 +- drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c | 11 + drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 5 + drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c | 2 + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 11 + drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 10 + drivers/net/netdevsim/netdev.c | 21 +- drivers/net/netdevsim/netdevsim.h | 1 + drivers/net/phy/qcom/qca807x.c | 2 +- drivers/net/tun_vnet.h | 3 +- include/net/dst_metadata.h | 7 +- include/net/ip_tunnels.h | 7 +- net/core/dst.c | 6 +- net/sched/act_tunnel_key.c | 8 +- 31 files changed, 1353 insertions(+), 32 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.a5mlAwXbCe b/tmp/tmp.uOQlxEpGN1 index 5fd410d2af2e..b00f3062e295 100644 --- a/tmp/tmp.a5mlAwXbCe +++ b/tmp/tmp.uOQlxEpGN1 @@ -3,15 +3,13 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +Merge tag 'bpf-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf ipvlan: ensure network headers are in skb linear part net: better track kernel sockets lifetime net: stmmac: print stmmac_init_dma_engine() errors using netdev_err() net: set the minimum for net_hotdata.netdev_budget_usecs net: mvpp2: cls: Fixed Non IP flow, with vlan tag flow defination. selftests: fib_nexthops: do not mark skipped tests as failed -net: ethernet: ti: am65-cpsw: select PAGE_POOL -net: phy: marvell-88q2xxx: Prevent hwmon access with asserted reset -net: phy: marvell-88q2xxx: Enable temperature measurement in probe again selftests: fib_rule_tests: Add DSCP mask match tests netlink: specs: Add FIB rule DSCP mask attribute net: fib_rules: Enable DSCP mask usage @@ -38,58 +36,23 @@ net: phy: qca807x: use new phy_package_shared getters net: phy: add getters for public members of struct phy_package_shared net: phy: move PHY package related code from phy.h to phy_package.c net: phy: move PHY package code from phy_device.c to own source file -net/mlx5: Use secs_to_jiffies() instead of msecs_to_jiffies() tcp: devmem: don't write truncated dmabuf CMSGs to userspace net: ipconfig: convert timeouts to secs_to_jiffies() netfilter: xt_IDLETIMER: convert timeouts to secs_to_jiffies() net/smc: convert timeouts to secs_to_jiffies() -net: phy: remove unused feature array declarations -gve: Add RSS cache for non RSS device option scenario -crypto: scatterwalk - don't split at page boundaries when !HIGHMEM -crypto: scatterwalk - remove obsolete functions -crypto: skcipher - use the new scatterwalk functions -net/tls: use the new scatterwalk functions -crypto: x86/aegis - use the new scatterwalk functions -crypto: x86/aes-gcm - use the new scatterwalk functions -crypto: stm32 - use the new scatterwalk functions -crypto: s5p-sss - use the new scatterwalk functions -crypto: s390/aes-gcm - use the new scatterwalk functions -crypto: nx - use the new scatterwalk functions -crypto: arm64 - use the new scatterwalk functions -crypto: arm/ghash - use the new scatterwalk functions -crypto: aegis - use the new scatterwalk functions -crypto: skcipher - use scatterwalk_start_at_pos() -crypto: scatterwalk - add scatterwalk_get_sglist() -crypto: scatterwalk - add new functions for copying data -crypto: scatterwalk - add new functions for iterating through data -crypto: scatterwalk - add new functions for skipping data -crypto: scatterwalk - move to next sg entry just in time -Bluetooth: SCO: add TX timestamping socket-level mechanism -Bluetooth: L2CAP: add TX timestamping -Bluetooth: ISO: add TX timestamping -Bluetooth: add support for skb TX SND/COMPLETION timestamping -net-timestamp: COMPLETION timestamp on packet tx completion -selftests/net: big_tcp: return xfail on slow machines -netdevsim: call napi_schedule from a timer context -octeontx2: hide unused label -net: Add options as a flexible array to struct ip_tunnel_info -ip_tunnel: Use ip_tunnel_info() helper instead of 'info + 1' -net: phy: qcom: qca807x fix condition for DAC_DSP_BIAS_CURRENT -selftests: net: Add test cases for link and peer netns -selftests: net: Add python context manager for netns entering -rtnetlink: Create link directly in target net namespace -rtnetlink: Remove "net" from newlink params -net: xfrm: Use link netns in newlink() of rtnl_link_ops -net: ipv6: Use link netns in newlink() of rtnl_link_ops -net: ipv6: Init tunnel link-netns before registering dev -net: ip_tunnel: Use link netns in newlink() of rtnl_link_ops -net: ip_tunnel: Don't set tunnel->net in ip_tunnel_init() -ieee802154: 6lowpan: Validate link netns in newlink() of rtnl_link_ops -net: Use link/peer netns in newlink() of rtnl_link_ops -rtnetlink: Pack newlink() params into struct -rtnetlink: Lookup device in target netns when creating link -net: phy: qt2025: Fix hardware revision check comment -MAINTAINERS: fix dwmac-s32 entry +eth: bnxt: remove most dependencies on RTNL +docs: net: document new locking reality +net: add option to request netdev instance lock +net: replace dev_addr_sem with netdev instance lock +net: ethtool: try to protect all callback with netdev instance lock +net: hold netdev instance lock during ndo_bpf +net: hold netdev instance lock during sysfs operations +net: hold netdev instance lock during ioctl operations +net: hold netdev instance lock during rtnetlink operations +net: hold netdev instance lock during queue operations +net: hold netdev instance lock during ndo_setup_tc +net: hold netdev instance lock during ndo_open/ndo_stop +net: ethernet: ti: am65-cpsw: select PAGE_POOL net/mlx5e: Separate extended link modes request from link modes type selection net/mlx5e: Change eth_proto parameter naming net/mlx5e: Introduce ptys2ethtool_process_link() @@ -109,11 +72,6 @@ net: phy: add phylib-internal.h net: ti: icss-iep: Fix phase offset configuration for perout signal net: ti: icss-iep: Fix pwidth configuration for perout signal net: stmmac: dwmac-loongson: Add fix_soc_reset() callback -mips: dts: cameo-rtl9302c: Add switch block -mips: dts: realtek: Add switch interrupts -dt-bindings: net: Add Realtek MDIO controller -dt-bindings: net: Add switch ports and interrupts to RTL9300 -dt-bindings: net: Move realtek,rtl9301-switch to net afs: Give an afs_server object a ref on the afs_cell object it points to afs: Fix the server_list to unuse a displaced server rather than putting it rxrpc: Fix locking issues with the peer record hash @@ -133,11 +91,26 @@ net: pse-pd: Add support for PSE power domains net: pse-pd: tps23881: Add support for PSE events and interrupts net: pse-pd: Add support for reporting events net: ethtool: Add support for ethnl_info_init_ntf helper function -ppp: Fix KMSAN warning by initializing 2-byte header virtio-net: tweak for better TX performance in NAPI mode -eth: fbnic: Add ethtool support for IRQ coalescing -net: ngbe: Add support for 1PPS and TOD -net: wangxun: Add periodic checks for overflow and errors -net: wangxun: Support to get ts info -net: wangxun: Add support for PTP clock -tun: Pad virtio headers +Merge branch 'bpf-skip-non-exist-keys-in-generic_map_lookup_batch' +selftests: bpf: test batch lookup on array of maps with holes +bpf: skip non exist keys in generic_map_lookup_batch +bpf: Handle allocation failure in acquire_lock_state +Merge branch 'bpf-some-fixes-for-nullness-elision' +bpf: verifier: Disambiguate get_constant_map_key() errors +bpf: selftests: Test constant key extraction on irrelevant maps +bpf: verifier: Do not extract constant map keys for irrelevant maps +bpf: Fix softlockup in arena_map_free on 64k page kernel +net: Add rx_skb of kfree_skb to raw_tp_null_args[]. +bpf: Fix deadlock when freeing cgroup storage +Merge branch 'bpf-fix-wrong-copied_seq-calculation-and-add-tests' +selftests/bpf: Add strparser test for bpf +selftests/bpf: Fix invalid flag of recv() +bpf: Disable non stream socket for strparser +bpf: Fix wrong copied_seq calculation +strparser: Add read_sock callback +bpf: avoid holding freeze_mutex during mmap operation +bpf: unify VM_WRITE vs VM_MAYWRITE use in BPF map mmaping logic +selftests/bpf: Adjust data size to have ETH_HLEN +bpf, test_run: Fix use-after-free issue in eth_skb_pkt_type() +bpf: Remove unnecessary BTF lookups in bpf_sk_storage_tracing_allowed