Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-07-12--00-00 (v6.16-rc5-1481-gad67115a8116) remotes/brancher/net-next-2025-07-12--03-00 (v6.16-rc5-1482-g7baecbcbf6a4) ==== BASE DIFF ==== drivers/net/ethernet/intel/ice/ice_adapter.c | 1 + drivers/net/ethernet/intel/ice/ice_adapter.h | 5 +- drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 14 +- drivers/net/ethernet/intel/ice/ice_common.c | 233 ++++++++++++++++++++- drivers/net/ethernet/intel/ice/ice_common.h | 6 + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 12 ++ drivers/net/ethernet/intel/ice/ice_lib.c | 35 ++++ drivers/net/ethernet/intel/ice/ice_lib.h | 8 + drivers/net/ethernet/intel/ice/ice_sriov.c | 19 +- drivers/net/ethernet/intel/ice/ice_sriov.h | 7 + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 3 + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 26 ++- drivers/net/ethernet/intel/ice/ice_virtchnl.c | 59 +----- drivers/net/ethernet/intel/ice/ice_virtchnl.h | 19 ++ drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c | 8 +- drivers/net/ethernet/sfc/falcon/ethtool.c | 12 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- drivers/net/netdevsim/bus.c | 26 ++- drivers/net/netdevsim/dev.c | 14 +- drivers/net/netdevsim/netdev.c | 9 +- drivers/net/netdevsim/netdevsim.h | 9 +- drivers/net/virtio_net.c | 22 +- include/net/act_api.h | 23 +- include/net/tc_act/tc_connmark.h | 1 + include/net/tc_act/tc_csum.h | 1 + include/net/tc_act/tc_ct.h | 2 +- include/net/tc_act/tc_ctinfo.h | 7 +- include/net/tc_act/tc_mpls.h | 1 + include/net/tc_act/tc_nat.h | 1 + include/net/tc_act/tc_pedit.h | 1 + include/net/tc_act/tc_police.h | 3 +- include/net/tc_act/tc_skbedit.h | 1 + net/batman-adv/bat_algo.c | 1 + net/batman-adv/bat_algo.h | 2 - net/batman-adv/bat_iv_ogm.c | 25 +-- net/batman-adv/bat_v.c | 6 +- net/batman-adv/bat_v_elp.c | 8 +- net/batman-adv/bat_v_ogm.c | 14 +- net/batman-adv/hard-interface.c | 39 ++-- net/batman-adv/main.c | 7 +- net/batman-adv/main.h | 2 +- net/batman-adv/mesh-interface.c | 6 +- net/batman-adv/multicast.c | 6 +- net/batman-adv/netlink.c | 7 +- net/batman-adv/originator.c | 7 +- net/batman-adv/send.c | 7 +- net/sched/act_connmark.c | 18 +- net/sched/act_csum.c | 18 +- net/sched/act_ct.c | 30 +-- net/sched/act_ctinfo.c | 42 ++-- net/sched/act_mpls.c | 21 +- net/sched/act_nat.c | 25 ++- net/sched/act_pedit.c | 20 +- net/sched/act_police.c | 18 +- net/sched/act_skbedit.c | 20 +- net/sched/sch_netem.c | 40 ++++ tools/testing/selftests/drivers/net/hw/iou-zcrx.py | 98 ++++----- tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/lib.sh | 23 ++ tools/testing/selftests/net/netdev-l2addr.sh | 59 ++++++ .../net/packetdrill/tcp_blocking_blocking-read.pkt | 2 + .../selftests/net/packetdrill/tcp_inq_client.pkt | 3 + .../selftests/net/packetdrill/tcp_inq_server.pkt | 3 + .../tc-testing/tc-tests/infra/qdiscs.json | 5 +- .../tc-testing/tc-tests/qdiscs/netem.json | 81 +++++++ 66 files changed, 883 insertions(+), 373 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.a9MVrVIrlr b/tmp/tmp.t6DsTZVrYi index 591272d19771..6671f9fc2beb 100644 --- a/tmp/tmp.a9MVrVIrlr +++ b/tmp/tmp.t6DsTZVrYi @@ -6,6 +6,11 @@ tc_action dbg [local patch] forwarding: set timeout to 3 hours [local patch] selftests: net: enable profiling [local patch] timestamp - try waking [local patch] +selftests: drv-net: add rss_api to the Makefile +selftests: drv-net: Test head-adjustment support +selftests: drv-net: Test tail-adjustment support +selftests: drv-net: Test XDP_TX support +selftests: drv-net: Test XDP_PASS/DROP support hv_netvsc: Switch VF namespace in netvsc_open instead rpl: Fix use-after-free in rpl_do_srh_inline(). netdevsim: implement peer queue flow control @@ -41,24 +46,11 @@ selftests: drv-net: rss_api: test setting indirection table via Netlink tools: ynl: support packing binary arrays of scalars selftests: drv-net: rss_api: factor out checking min queue count ethtool: rss: initial RSS_SET (indirection table handling) -ice: introduce ice_get_vf_by_dev() wrapper -ice: avoid rebuilding if MSI-X vector count is unchanged -ice: use pci_iov_vf_id() to get VF ID -ice: expose VF functions used by live migration -ice: move ice_vsi_update_l2tsel to ice_lib.c -ice: save RSS hash configuration for migration -ice: add functions to get and set Tx queue context -ice: add support for reading and unpacking Rx queue context Add support to set NAPI threaded for individual NAPI net: phy: Don't register LEDs for genphy -net: ll_temac: Fix incorrect PHY node reference in debug message net/mlx5: Correctly set gso_size when LRO is used tools: ynl: default to --process-unknown in installed mode -net: emaclite: Fix missing pointer increment in aligned_read() -batman-adv: store hard_iface as iflink private data -batman-adv: Start new development cycle selftests: net: increase inter-packet timeout in udpgro.sh -selftests/net: packetdrill: add --mss option to three tests dpll: zl3073x: Add support to get fractional frequency offset dpll: zl3073x: Add support to adjust phase dpll: zl3073x: Implement phase offset monitor feature @@ -72,8 +64,6 @@ net: renesas: rswitch: add modifiable ageing time net: renesas: rswitch: add offloading for L2 switching net: renesas: rswitch: configure default ageing time net: renesas: rswitch: rename rswitch.c to rswitch_main.c -selftests: net: add netdev-l2addr.sh for testing L2 address functionality -net: netdevsim: Support setting dev->perm_addr on port creation net/sched: sch_qfq: Fix race condition on qfq_aggregate net: bonding: add bond_is_icmpv6_nd() helper net: usbnet: Avoid potential RCU stall on LINK_CHANGE event @@ -85,33 +75,7 @@ net: mctp: Add test for conflicting bind()s net: mctp: Treat MCTP_NET_ANY specially in bind() net: mctp: Prevent duplicate binds net: mctp: mctp_test_route_extaddr_input cleanup -hinic3: Interrupt request configuration -hinic3: Mailbox management interfaces -hinic3: Mailbox framework -hinic3: TX & RX Queue coalesce interfaces -hinic3: Command Queue interfaces -hinic3: Command Queue framework -hinic3: Complete Event Queue interfaces -hinic3: Async Event Queue interfaces tcp: extend tcp_retransmit_skb tracepoint with failure reasons net: Allow non parent devices to be used for ZC DMA selftests: bonding: add test for passive LACP mode bonding: update ntt to true in passive mode -selftests: flip local/remote endpoints in iou-zcrx.py -sfc: falcon: refactor and document ef4_ethtool_get_rxfh_fields -Merge branch 'net_sched-act-extend-rcu-use-in-dump-methods' -net_sched: act_skbedit: use RCU in tcf_skbedit_dump() -net_sched: act_police: use RCU in tcf_police_dump() -net_sched: act_pedit: use RCU in tcf_pedit_dump() -net_sched: act_nat: use RCU in tcf_nat_dump() -net_sched: act_mpls: use RCU in tcf_mpls_dump() -net_sched: act_ctinfo: use RCU in tcf_ctinfo_dump() -net_sched: act_ctinfo: use atomic64_t for three counters -net_sched: act_ct: use RCU in tcf_ct_dump() -net_sched: act_csum: use RCU in tcf_csum_dump() -net_sched: act_connmark: use RCU in tcf_connmark_dump() -net_sched: act: annotate data-races in tcf_lastuse_update() and tcf_tm_dump() -eth: fbnic: fix ubsan complaints about OOB accesses -virtio_net: simplify tx queue wake condition check -selftests/tc-testing: Add tests for restrictions on netem duplication -net/sched: Restrict conditions for adding duplicating netems to qdisc tree