Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-07-24--09-00 (v6.16-rc6-1889-gfaff836a80b6) remotes/brancher/net-next-2025-07-24--12-00 (v6.16-rc6-2101-g514b7fb63c7e) ==== BASE DIFF ==== drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 31 ++++++++++ drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 36 ++++++----- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 9 ++- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +- drivers/s390/net/ism_drv.c | 3 + include/linux/ism.h | 1 + include/net/xfrm.h | 15 ++--- net/ipv4/ipcomp.c | 2 + net/ipv4/xfrm4_input.c | 3 + net/ipv6/ipcomp6.c | 2 + net/ipv6/xfrm6_input.c | 3 + net/ipv6/xfrm6_tunnel.c | 2 +- net/key/af_key.c | 2 +- net/xfrm/xfrm_device.c | 1 - net/xfrm/xfrm_interface_core.c | 7 +-- net/xfrm/xfrm_ipcomp.c | 3 +- net/xfrm/xfrm_state.c | 69 ++++++++-------------- net/xfrm/xfrm_user.c | 3 +- 19 files changed, 111 insertions(+), 89 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.KSBXHnO64y b/tmp/tmp.cHYmUjBhLn index 872cd140b082..8ce099cc15fe 100644 --- a/tmp/tmp.KSBXHnO64y +++ b/tmp/tmp.cHYmUjBhLn @@ -6,11 +6,21 @@ tc_action dbg [local patch] forwarding: set timeout to 3 hours [local patch] selftests: net: enable profiling [local patch] timestamp - try waking [local patch] +dt-bindings: net: Replace bouncing Alexandru Tachici emails +ipv6: mcast: Add ip6_mc_find_idev() helper +net/core: fix wrong return value in __splice_segment +Octeontx2-pf: ethtool: Display "Autoneg" and "Port" fields +Merge tag 'wireless-next-2025-07-24' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next net: check the minimum value of gso size in virtio_net_hdr_to_skb() net: wangxun: support to use adaptive RX coalescing net: wangxun: limit tx_max_coalesced_frames_irq net: wangxun: change the default ITR setting selftests: netfilter: ipvs.sh: Explicity disable rp_filter on interface tunl0 +net: ti: prueth: Adds IEP support for PRUETH on AM33x, AM43x and AM57x SOCs +net: ti: prueth: Adds link detection, RX and TX support. +net: ti: prueth: Adds PRUETH HW and SW configuration +net: ti: prueth: Adds ICSSM Ethernet driver +dt-bindings: net: ti: Adds DUAL-EMAC mode support on PRU-ICSS2 for AM57xx, AM43xx and AM33xx SOCs Octeontx2-vf: Fix max packet length errors selftests: rtnetlink.sh: remove esp4_offload after test net: dsa: b53: mmap: Implement bcm63xx ephy power control @@ -71,19 +81,10 @@ igb: xsk: solve negative overflow of nb_pkts in zerocopy mode stmmac: xsk: fix negative overflow of budget in zerocopy mode selftests: drv-net: Make command requirements explicit selftests: drv-net: Fix remote command checking in require_cmd() -net: clear offline CPU backlog.state in dev_cpu_dead() xfrm: Skip redundant statistics update for crypto offload xfrm: Duplicate SPI Handling xfrm: hold device only for the asynchronous decryption net: hibmcge: support for statistics of reset failures -Revert "xfrm: destroy xfrm_state synchronously on net exit path" -xfrm: delete x->tunnel as we delete x -xfrm: interface: fix use-after-free after changing collect_md xfrm interface -xfrm: ipcomp: adjust transport header after decompressing -xfrm: Set transport header to fix UDP GRO handling -xfrm: always initialize offload path -xfrm: state: use a consistent pcpu_id in xfrm_state_find -xfrm: state: initialize state_ptrs earlier in xfrm_state_find net/mlx5e: Fix potential deadlock by deferring RX timeout recovery net/mlx5e: Remove skb secpath if xfrm state is not found net/mlx5e: Clear Read-Only port buffer size in PBMC before update @@ -93,20 +94,12 @@ net: dsa: microchip: Fix wrong rx drop MIB counter for KSZ8863 net: define an enum for the napi threaded state net: Use netif_threaded_enable instead of netif_set_threaded in drivers net: Create separate gro_flush_normal function -net: otx2: handle NULL returned by xdp_convert_buff_to_frame() -sfc: siena: handle NULL returned by xdp_convert_buff_to_frame() -sfc: handle NULL returned by xdp_convert_buff_to_frame() net/mlx5: Fix build -Wframe-larger-than warnings sctp: Replace sockaddr with sockaddr_inet in sctp_addr union wireguard: peer: Replace sockaddr with sockaddr_inet ipv6: Add sockaddr_inet unified address structure -s390/ism: fix concurrency management in ism_cmd() net/mlx5e: Expose TIS via devlink tx reporter diagnose net/mlx5e: Support routed networks during IPsec MACs initialization -net: hns3: default enable tx bounce buffer when smmu enabled -net: hns3: fixed vf get max channels bug -net: hns3: disable interrupt when ptp init failed -net: hns3: fix concurrent setting vlan filter issue Documentation: networking: Document the phy_port infrastructure net: phy: dp83822: Add SFP support through the phy_port interface net: phy: Only rely on phy_port for PHY-driven SFP @@ -150,6 +143,8 @@ net: Call trace_sock_exceed_buf_limit() for memcg failure with SK_MEM_RECV. tcp: Simplify error path in inet_csk_accept(). mptcp: Use tcp_under_memory_pressure() in mptcp_epollin_ready(). mptcp: Fix up subflow's memcg when CONFIG_SOCK_CGROUP_DATA=n. +ssb: use new GPIO line value setter callbacks for the second GPIO chip +wifi: Fix typos Bluetooth: Add PA_LINK to distinguish BIG sync and PA sync connections Bluetooth: hci_event: Mask data status from LE ext adv reports Bluetooth: btintel_pcie: Fix Alive Context State Handling @@ -192,3 +187,203 @@ Bluetooth: btintel_pcie: Reword restart to recovery Bluetooth: btintel_pcie: Support Function level reset Bluetooth: btusb: Add support for variant of RTL8851BE (USB ID 13d3:3601) Bluetooth: btusb: Add USB ID 3625:010b for TP-LINK Archer TX10UB Nano +Merge tag 'iwlwifi-next-2025-07-23' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next +wifi: brcmsmac: Use str_true_false() helper +wifi: brcmfmac: fix EXTSAE WPA3 connection failure due to AUTH TX failure +wifi: brcm80211: Remove yet more unused functions +wifi: brcm80211: Remove more unused functions +wifi: brcm80211: Remove unused functions +wifi: iwlwifi: Revert "wifi: iwlwifi: remove support of several iwl_ppag_table_cmd versions" +wifi: iwlwifi: check validity of the FW API range +wifi: iwlwifi: don't export symbols that we shouldn't +wifi: iwlwifi: mld: use spec link id and not FW link id +wifi: iwlwifi: mld: decode EOF bit for AMPDUs +wifi: iwlwifi: Remove support for rx OMI bandwidth reduction +wifi: iwlwifi: stop supporting iwl_omi_send_status_notif ver 1 +wifi: iwlwifi: remove SC2F firmware support +wifi: iwlwifi: mvm: Remove NAN support +wifi: iwlwifi: mld: avoid outdated reorder buffer head_sn +wifi: iwlwifi: mvm: avoid outdated reorder buffer head_sn +wifi: iwlwifi: disable certain features for fips_enabled +wifi: iwlwifi: mld: support channel survey collection for ACS scans +wifi: iwlwifi: mld: disable RX aggregation if requested +dt-bindings: net: wireless: rt2800: add SOC Wifi +MIPS: dts: ralink: mt7620a: add wifi +wifi: rt2x00: soc: modernize probe +wifi: rt2800: move 2x00soc to 2800soc +wifi: rt2800soc: allow loading from OF +wifi: rt2x00: remove mod_name from platform_driver +wifi: rt2x00: add COMPILE_TEST +wifi: mac80211: fix WARN_ON for monitor mode on some devices +wifi: brcmfmac: cyw: Fix __counted_by to be LE variant +wifi: mac80211: fix unassigned variable access +wifi: mac80211: don't require cipher and keylen in gtk rekey +wifi: nl80211: Set num_sub_specs before looping through sub_specs +wifi: mac80211: Write cnt before copying in ieee80211_copy_rnr_beacon() +Merge tag 'ath-next-20250721' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath into wireless-next +wifi: iwlwifi: mvm/fw: Avoid -Wflex-array-member-not-at-end warnings +wifi: iwlwifi: Fix typo "ransport" +wifi: iwlwifi: fix cmd length when sending WOWLAN_TSC_RSC_PARAM +wifi: ath12k: Correct tid cleanup when tid setup fails +wifi: ath12k: bring DFS support back for WCN7850 +wifi: ath12k: Prefer {} to {0} in initializers +wifi: ath11k: Prefer {} to {0} in initializers +wifi: ath10k: Prefer {} to {0} in initializers +wifi: cfg80211/mac80211: report link ID for unexpected frames +wifi: mac80211: determine missing link_id in ieee80211_rx_for_interface() based on frequency +wifi: brcmfmac: support CYW54591 PCIE device +wifi: brcmfmac: fix P2P discovery failure in P2P peer due to missing P2P IE +wifi: cfg80211: reject HTC bit for management frames +wifi: mac80211: remove ieee80211_remove_key +wifi: ath12k: Advertise encapsulation/decapsulation offload support to mac80211 +wifi: ath12k: Fix TX status reporting to mac80211 when offload is enabled +wifi: ath12k: Fix the handling of TX packets in Ethernet mode +wifi: ath12k: Add support to parse max ext2 wmi service bit +wifi: ath12k: fix endianness handling while accessing wmi service bit +Reapply "wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()" +wifi: mac80211: Check 802.11 encaps offloading in ieee80211_tx_h_select_key() +wifi: mac80211: Don't call fq_flow_idx() for management frames +wifi: mac80211: Do not schedule stopped TXQs +wifi: cfg80211: Add missing lock in cfg80211_check_and_end_cac() +wifi: plfxlc: Fix error handling in usb driver probe +wifi: mac80211: support returning the S1G short beacon skb +wifi: mac80211: support initialising current S1G short beacon index +wifi: mac80211: support initialising an S1G short beaconing BSS +wifi: cfg80211: support configuring an S1G short beaconing BSS +wifi: brcmfmac: Add support for the SDIO 43751 device +wifi: wilc1000: Use min() to improve code +wifi: mwifiex: Use max_t() to improve code +wifi: brcm80211: Use min() to improve code +wifi: brcmfmac: Fix typo "notifer" +wifi: mac80211: reject TDLS operations when station is not associated +wifi: brcmsmac: Remove const from tbl_ptr parameter in wlc_lcnphy_common_read_table() +wifi: mac80211: extend connection monitoring for MLO +wifi: mac80211: extend beacon monitoring for MLO +wifi: mac80211: Add link iteration macro for link data with rcu_dereference +wifi: mac80211: fix macro scoping in for_each_link_data +wifi: cfg80211/mac80211: remove wrong scan request n_channels +Merge tag 'rtw-next-2025-07-18' of https://github.com/pkshih/rtw +wifi: rtlwifi: Use min()/max() to improve code +wifi: rtw89: wow: Add Basic Rate IE to probe request in scheduled scan mode +wifi: rtw89: Lower the timeout in rtw89_fwdl_check_path_ready_ax() for USB +wifi: rtw89: Lower the timeout in rtw89_fw_read_c2h_reg() for USB +wifi: rtw89: check path range before using in rtw89_fw_h2c_rf_ps_info() +wifi: rtw89: purge obsoleted scan events with software sequence number +wifi: rtw89: dynamically update EHT preamble puncturing +wifi: rtw89: mac: reduce PPDU status length for WiFi 6 chips +wifi: rtw89: trigger TX stuck if FIFO full +wifi: ath11k: fix sleeping-in-atomic in ath11k_mac_op_set_bitrate_mask() +wifi: ath5k: Use max() to improve code +wifi: ath12k: remove unneeded semicolon in ath12k_mac_parse_tx_pwr_env() +wifi: ath12k: Validate peer_id before searching for peer +wifi: ath12k: Use HTT_TCL_METADATA_VER_V1 in FTM mode +wifi: rtw88: Fix macid assigned to TDLS station +wifi: rtw88: enable TX reports for the management queue +wifi: rtl8xxxu: Fix RX skb size for aggregation disabled +wifi: rtw89: 8852b: implement RFK multi-channel handling and support chanctx up to 2 +wifi: rtw89: 8852b: configure FW version for SCAN_OFFLOAD_EXTRA_OP feature +wifi: rtw89: 8852bt: implement RFK multi-channel handling and support chanctx up to 2 +wifi: rtw89: 8852bt: configure FW version for SCAN_OFFLOAD_EXTRA_OP feature +wifi: rtw89: tweak tx wake notify matching condition +wifi: rtw89: update SER L2 type default value +wifi: rtw89: introduce fw feature group and redefine CRASH_TRIGGER +wifi: rtw89: check LPS H2C command complete by C2H reg instead of done ack +wifi: rtw89: mcc: solve GO's TBTT change and TBTT too close to NoA issue +wifi: rtw89: extend HW scan of WiFi 7 chips for extra OP chan when concurrency +wifi: rtw89: mcc: when MCC stop forcing to stay at GO role +wifi: rtw89: mcc: enlarge GO NoA duration to cover channel switching time +wifi: rtw89: add DIG suspend/resume flow when scan and connection +wifi: rtw89: mcc: add H2C command to support different PD level in MCC +wifi: rtw89: regd/acpi: support 6 GHz VLP policy via ACPI DSM +wifi: rtw89: regd/acpi: support regulatory rules via ACPI DSM and parse rule of regd_UK +wifi: rtw89: regd/acpi: update field definition to specific country in UNII-4 conf +wifi: rtw89: regd/acpi: support country CA by BIT(1) in 6 GHz SP conf +wifi: ath12k: Add support to enqueue management frame at MLD level +wifi: ath12k: Enable memory profile selection for QCN9274 +wifi: ath12k: Refactor macros to use memory profile-based values +wifi: ath12k: Remove redundant TID calculation for QCN9274 +wifi: ath12k: Add a table of parameters entries impacting memory consumption +wifi: ath12k: support average ack rssi in station dump +wifi: ath12k: allow beacon protection keys to be installed in hardware +wifi: ath12k: set RX_FLAG_SKIP_MONITOR in WBM error path +wifi: ath12k: pack HTT pdev rate stats structs +wifi: ath12k: update unsupported bandwidth flags in reg rules +wifi: ath12k: Add num_stations counter for each interface +wifi: ath12k: properly set bit for pdev mask for firmware PPDU_STATS request +wifi: ath12k: Block radio bring-up in FTM mode +wifi: ath12k: advertise NL80211_FEATURE_TX_POWER_INSERTION support +wifi: ath12k: add support for Tx Power insertion in RRM action frame +wifi: ath12k: fetch tx_retry and tx_failed from htt_ppdu_stats_user_cmpltn_common_tlv +wifi: ath12k: correctly update bw for ofdma packets +wifi: ath12k: add EHT support for TX rate +wifi: ath12k: add link support for multi-link in arsta +wifi: ath12k: fill link station statistics for MLO +wifi: rtw89: Enable the new rtw89_8852bu module +wifi: rtw89: Add rtw8852bu.c +wifi: rtw89: 8852b: Add rtw8852b_hfc_param_ini_usb +wifi: rtw89: 8852b: Add rtw8852b_dle_mem_usb3 +wifi: rtw89: 8852b: Fix rtw8852b_pwr_{on,off}_func() for USB +wifi: rtw89: 8852bx: Accept USB devices and load their MAC address +wifi: rtw89: enter power save mode aggressively +wifi: rtw89: Enable the new USB modules +wifi: rtw89: Add rtw8851bu.c +wifi: rtw89: Add usb.{c,h} +wifi: rtw89: Add some definitions for USB +wifi: rtw89: Fix rtw89_mac_power_switch() for USB +wifi: rtw89: 8851b: Modify rtw8851b_pwr_{on,off}_func() for USB +wifi: rtw89: Hide some errors when the device is unplugged +wifi: rtw89: Add extra TX headroom for USB +wifi: rtw89: Disable deep power saving for USB/SDIO +wifi: rtw89: Add rtw8851b_hfc_param_ini_usb +wifi: rtw89: Add rtw8851b_dle_mem_usb{2,3} +wifi: rtw89: Make hfc_param_ini in rtw89_chip_info an array +wifi: rtw89: Make dle_mem in rtw89_chip_info an array +wifi: rtw89: 8851b: Accept USB devices and load their MAC address +wifi: rtw89: 8851b: rfk: update IQK to 0x14 +wifi: rtw89: 8851b: rfk: update DPK to 0x11 +wifi: rtw89: 8851b: update NCTL 0xB +wifi: rtw89: 8851b: adjust ADC setting for RF calibration +wifi: rtw89: 8851b: set ADC bandwidth select according to calibration value +wifi: rtw89: 8851b: rfk: extend DPK path_ok type to u8 +wifi: rtw88: coex: Use bitwise instead of arithmetic operator for flags +wifi: ath12k: add extended NSS bandwidth support for 160 MHz +wifi: ath12k: add support for 160 MHz bandwidth +wifi: ath12k: clean up 80P80 support +wifi: ath12k: add support for setting fixed HE rate/GI/LTF +wifi: ath12k: generate rx and tx mcs maps for supported HE mcs +wifi: ath12k: move HE MCS mapper to a separate function +wifi: ath12k: push EHT MU-MIMO params to hardware +wifi: ath12k: push HE MU-MIMO params to hardware +wifi: ath10k: shutdown driver when hardware is unreliable +wifi: ath12k: fix timeout while waiting for regulatory update during interface creation +wifi: ath6kl: Fix spellings +wifi: ath10k: Fix Spelling +wifi: wil6210: wmi: Fix spellings reported by codespell +wifi: ath12k: Add support to RTT stats +wifi: ath12k: Add support to TDMA and MLO stats +wifi: ath12k: Add support for transmit histogram stats +wifi: ath12k: Clear auth flag only for actual association in security mode +wifi: ath12k: fix dest ring-buffer corruption when ring is full +wifi: ath12k: fix source ring-buffer corruption +wifi: ath12k: use plain access for descriptor length +wifi: ath12k: fix dest ring-buffer corruption +wifi: ath11k: fix dest ring-buffer corruption when ring is full +wifi: ath11k: fix source ring-buffer corruption +wifi: ath11k: use plain accesses for monitor descriptor +wifi: ath11k: use plain access for descriptor length +wifi: ath11k: fix dest ring-buffer corruption +wifi: ath12k: Send WMI_VDEV_SET_TPC_POWER_CMD for AP vdev +wifi: ath12k: Add memset and update default rate value in wmi tx completion +wifi: ath12k: Fix beacon reception for sta associated to Non-TX AP +wifi: ath12k: Fix station association with MBSSID Non-TX BSS +wifi: ath12k: use real noise floor instead of default value +wifi: ath12k: handle WMI event for real noise floor calculation +wifi: ath11k: Make read-only const array svc_id static const +wifi: ath11k: fix suspend use-after-free after probe failure +wifi: ath11k: clear initialized flag for deinit-ed srng lists +wifi: ath11k: support usercase-specific firmware overrides +dt-bindings: net: wireless: ath11k-pci: describe firmware-name property +wifi: ath9k: ahb: replace id_table with of +dt-bindings: net: wireless: ath9k: add WIFI bindings +wifi: ath9k: ahb: reorder includes +wifi: ath9k: ahb: reorder declarations