Re: [GIT PULL] wireless-2025-11-05: manual merge

[Matthieu Baerts <matttbe@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 611 bytes --]

Hi Johannes,

On 06/11/2025 10:03, Johannes Berg wrote:
> Unrelated to that: I forgot to mention that there's a conflict now
> between net and net-next, which had been reported before between ath and
> ath-next and then wireless and wireless-next, but it's just a simple
> variable addition overlap:
> 
> https://lore.kernel.org/all/20251030113037.1932c6d2@canb.auug.org.au/

Thank you for the pointer!

Just in case someone else has this conflict, you can use the rr-cache
files from:

 https://github.com/multipath-tcp/mptcp-upstream-rr-cache/commit/56cf8ff

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

[-- Attachment #2: cb34617c2d3ea4f78cfc0768bc4c8d1f00754f00.patch --]
[-- Type: text/x-patch, Size: 538 bytes --]

diff --cc drivers/net/wireless/ath/ath12k/mac.c
index 0348601ecc50,db351c922018..9333225ceef3
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@@ -4423,7 -4209,7 +4404,8 @@@ static void ath12k_mac_bss_info_changed
  {
  	struct ath12k_vif *ahvif = arvif->ahvif;
  	struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);
+ 	struct ieee80211_vif_cfg *vif_cfg = &vif->cfg;
 +	struct ath12k_link_vif *tx_arvif;
  	struct cfg80211_chan_def def;
  	u32 param_id, param_value;
  	enum nl80211_band band;