Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-09-11--00-00 (v6.17-rc4-1120-g407421a66235) remotes/brancher/net-next-2025-09-11--03-00 (v6.17-rc4-1120-g5eb2b19ef5e6) ==== BASE DIFF ==== Documentation/networking/can.rst | 2 +- Documentation/networking/mptcp.rst | 2 +- MAINTAINERS | 1 + drivers/net/can/rcar/rcar_can.c | 8 +- drivers/net/can/xilinx_can.c | 16 +- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 1 + drivers/net/ethernet/intel/i40e/i40e_common.c | 34 ++ drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +- drivers/net/ethernet/intel/i40e/i40e_prototype.h | 2 + drivers/net/ethernet/intel/igb/igb_ethtool.c | 5 +- drivers/net/ethernet/intel/igb/igb_main.c | 3 +- drivers/net/ethernet/microsoft/mana/mana_en.c | 10 - drivers/net/ethernet/renesas/sh_eth.c | 4 + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 3 +- drivers/net/usb/asix_devices.c | 13 - include/linux/ethtool.h | 4 +- include/net/netfilter/nf_tables.h | 1 - include/net/netfilter/nf_tables_core.h | 10 +- include/net/netns/nftables.h | 1 + net/can/j1939/bus.c | 5 +- net/can/j1939/j1939-priv.h | 1 + net/can/j1939/main.c | 3 + net/can/j1939/socket.c | 52 +++ net/netfilter/nf_tables_api.c | 66 ++-- net/netfilter/nft_lookup.c | 46 ++- net/netfilter/nft_set_bitmap.c | 3 +- net/netfilter/nft_set_pipapo.c | 20 +- net/netfilter/nft_set_pipapo_avx2.c | 3 +- net/netfilter/nft_set_rbtree.c | 6 +- tools/net/ynl/pyynl/ethtool.py | 14 +- tools/net/ynl/pyynl/lib/__init__.py | 2 +- tools/net/ynl/pyynl/lib/nlspec.py | 2 +- tools/net/ynl/pyynl/lib/ynl.py | 7 +- tools/net/ynl/pyynl/ynl_gen_c.py | 31 +- tools/testing/selftests/net/can/config | 3 + tools/testing/selftests/net/fcnal-test.sh | 428 ++++++++++----------- 36 files changed, 474 insertions(+), 356 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.NYBl3u1wos b/tmp/tmp.QH4CBApfpq index 6ecf7eab8b96..95ab5282050e 100644 --- a/tmp/tmp.NYBl3u1wos +++ b/tmp/tmp.QH4CBApfpq @@ -11,7 +11,13 @@ nipa: config: x86: use periodic HZ tick nipa: disable 6.17's merge window kunit tests nipa: dbg net/sctp_vrf.sh nipa: disable random kunit tests +net/tcp: Fix a NULL pointer dereference when using TCP-AO with TCP_REPAIR. Merge tag 'bpf-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf +net/mlx5e: Report RS-FEC histogram statistics via ethtool +net/mlx5e: Add logic to read RS-FEC histogram bin ranges from PPHCR +net/mlx5e: Don't query FEC statistics when FEC is disabled +ethtool: add FEC bins histogramm report +net: mana: Reduce waiting time if HWC not responding net: phy: fixed_phy: remove two function stubs net: pcs: rzn1-miic: Add RZ/T2H MIIC support net: pcs: rzn1-miic: Add per-SoC control for MIIC register unlock/lock @@ -30,22 +36,10 @@ net: fec: add rx_frame_size to support configurable RX length net: fec: update MAX_FL based on the current MTU net: fec: add pagepool_order to support variable page size net: fec: use a member variable for maximum buffer size -e1000e: fix EEPROM length types for overflow checks -can: rcar_can: rcar_can_resume(): fix s2ram with PSCI -can: xilinx_can: xcan_write_frame(): fix use-after-free of transmitted SKB -can: j1939: j1939_local_ecu_get(): undo increment when j1939_local_ecu_get() fails -can: j1939: j1939_sk_bind(): call j1939_priv_put() immediately when j1939_local_ecu_get() failed -can: j1939: implement NETDEV_UNREGISTER notification handler -selftests: can: enable CONFIG_CAN_VCAN as a module -docs: networking: can: change bcm_msg_head frames member to support flexible array net: devmem: expose tcp_recvmsg_locked errors -net: dsa: microchip: configure strap pins during reset -dt-bindings: net: dsa: microchip: Add strap description dpaa2-switch: fix buffer pool seeding for control traffic -net: dsa: microchip: Select SPI_MODE 0 for KSZ8463 tools: ynl: rst: display attribute-set doc net: mvneta: add support for hardware timestamps -dpll: zl3073x: Allow to use custom phase measure averaging factor net/mlx5e: kTLS, cancel RX async resync request in error flows net: tls: Cancel RX async resync request on rdc_delta overflow net: tls: Introduce RX async resync request cancel function @@ -54,7 +48,6 @@ qed: Don't collect too many protection override GRC elements net: dlink: count dropped packets on skb allocation failure net/mlx5e: RX, Fix generating skb from non-linear xdp_buff for striding RQ net/mlx5e: RX, Fix generating skb from non-linear xdp_buff for legacy RQ -net: phy: avoid config_init failure on unattached PHY during resume selftests: Replace sleep with slowwait selftests: Disable dad for ipv6 in fcnal-test.sh selftests: bonding: add fail_over_mac testing @@ -64,19 +57,6 @@ wireguard: selftests: remove CONFIG_SPARSEMEM_VMEMMAP=y from qemu kernel config wireguard: queueing: always return valid online CPU in wg_cpumask_choose_online() wireguard: queueing: simplify wg_cpumask_next_online() net/mlx5: Not returning mlx5_link_info table when speed is unknown -selftests: net: replace sleeps in fcnal-test with waits -tools: ynl: check for membership with 'not in' -tools: ynl: use 'cond is None' -tools: ynl: remove unnecessary semicolons -tools: ynl: remove unused imports -tools: ynl: remove f-string without any placeholders -tools: ynl: remove assigned but never used variable -tools: ynl: avoid bare except -tools: ynl: fix undefined variable name -i40e: fix Jumbo Frame support after iPXE boot -i40e: fix IRQ freeing in i40e_vsi_request_irq_msix error path -igb: fix link test skipping when interface is admin down -igb: Fix NULL pointer dereference in ethtool loopback test net: phylink: warn if deprecated array-style fixed-link binding is used of: mdio: warn if deprecated fixed-link binding is used selftests: openvswitch: add a simple test for tunnel metadata @@ -92,11 +72,9 @@ net: stmmac: fix stmmac_xdp_open() clk_ptp_ref error cleanup net: stmmac: fix PTP error cleanup in __stmmac_open() net: stmmac: disable PTP clock after unregistering PTP net: stmmac: ptp: improve handling of aux_ts_lock lifetime -net: stmmac: dwc-qos: use PHY WoL geneve: Avoid -Wflex-array-member-not-at-end warning dt-bindings: net: Drop duplicate brcm,bcm7445-switch-v4.0.txt net: ethtool: handle EOPNOTSUPP from ethtool get_ts_info() method -octeon_ep: Validate the VF ID ipv6: udp: fix typos in comments net: use NUMA drop counters for softnet_data.dropped amd-xgbe: Add PPS periodic output support @@ -105,8 +83,6 @@ dpll: zl3073x: Refactor DPLL initialization dpll: zl3073x: Add firmware loading functionality dpll: zl3073x: Add low-level flash functions dpll: zl3073x: Add functions to access hardware registers -net: sh_eth: Disable WoL if system can not suspend -net: phy: MICREL: Update Kconfig help text hinic3: Fix code style (Missing a blank line before return) hinic3: Fix missing napi->dev in netif_queue_set_napi hinic3: Add port management @@ -121,21 +97,10 @@ hinic3: HW capability initialization hinic3: HW common function initialization hinic3: HW management interfaces hinic3: HW initialization -net: mana: Remove redundant netdev_lock_ops_to_full() calls tcp: Free TCP-AO/TCP-MD5 info/keys without RCU tcp: Destroy TCP-AO, TCP-MD5 keys in .sk_destruct() dt-bindings: net: Convert APM XGene MDIO to DT schema dt-bindings: net: Convert apm,xgene-enet to DT schema -arm64: dts: allwinner: t527: orangepi-4a: Enable Ethernet port -arm64: dts: allwinner: t527: avaota-a1: enable second Ethernet port -arm64: dts: allwinner: t527: avaota-a1: Add ethernet PHY reset setting -arm64: dts: allwinner: a527: cubie-a5e: Enable second Ethernet port -arm64: dts: allwinner: a527: cubie-a5e: Add ethernet PHY reset setting -arm64: dts: allwinner: a523: Add GMAC200 ethernet controller -soc: sunxi: sram: register regmap as syscon -soc: sunxi: sram: add entry for a523 -net: stmmac: Add support for Allwinner A523 GMAC200 -dt-bindings: net: sun8i-emac: Add A523 GMAC200 compatible tcp: accecn: try to fit AccECN option with SACK tcp: accecn: AccECN option ceb/cep and ACE field multi-wrap heuristics tcp: accecn: AccECN option failure handling @@ -159,7 +124,6 @@ net: phy: micrel: add MSE interface support for KSZ9477 family ethtool: netlink: add lightweight MSE reporting to LINKSTATE_GET ethtool: netlink: add ETHTOOL_MSG_MSE_GET and wire up PHY MSE access ethtool: introduce core UAPI and driver API for PHY MSE diagnostics -net: usb: asix: ax88772: drop phylink use in PM to avoid MDIO runtime PM wakeups net: stmmac: dwmac-renesas-gbeth: Add support for RZ/T2H SoC net: stmmac: dwmac-renesas-gbeth: Use OF data for configuration dt-bindings: net: renesas,rzv2h-gbeth: Document Renesas RZ/T2H and RZ/N2H SoCs @@ -173,7 +137,6 @@ selftests: traceroute: Return correct value on failure ipv4: icmp: Fix source IP derivation in presence of VRFs ipv4: icmp: Pass IPv4 control block structure as an argument to __icmp_send() ipv4: cipso: Simplify IP options handling in cipso_v4_error() -net: ethtool: fix wrong type used in struct kernel_ethtool_ts_info eth: 8139too: Make 8139TOO_PIO depend on !NO_IOPORT_MAP selftests: forwarding: Reorder arguments to obey POSIX getopt net: xdp: handle frags with unreadable memory