Hi all,

Today's linux-next merge of the wireless-next tree got a conflict in:

  net/mac80211/mlme.c

between commit:

  4af2b71495a3f ("wifi: mac80211: fix use-after-free on TTLM disconnect")

from the wireless tree and commit:

  1d8b10787a3d3 ("wifi: mac80211: mlme: partially handle UHR updates")

from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc net/mac80211/mlme.c
index b5efc6ccc9853,456b289bb072b..0000000000000
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -8488,9 -8983,12 +8985,13 @@@ static void ieee80211_rx_mgmt_beacon(st
  					       elems->cisco_dtpc_elem);
  
  	ieee80211_ml_reconfiguration(sdata, elems);
 -	ieee80211_process_adv_ttlm(sdata, elems,
 -				      le64_to_cpu(mgmt->u.beacon.timestamp));
 +	if (!ieee80211_process_adv_ttlm(sdata, elems,
 +					le64_to_cpu(mgmt->u.beacon.timestamp)))
 +		goto free;
+ 	if (!ieee80211_rx_mgmt_beacon_uhr_param_upd(local, link, link_sta, elems,
+ 						    config_bw_out.ap_non_dbe_width,
+ 						    dbe_enabled_before))
+ 		goto free;
  
  apply:
  	ieee80211_link_info_change_notify(sdata, link, changed);