Received-SPF: pass (google.com: domain of linux-wireless+bounces-5257-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Tue, 26 Mar 2024 10:09:45 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kalle Valo <kvalo@kernel.org>, Johannes Berg <johannes@sipsolutions.net>
Cc: Wireless <linux-wireless@vger.kernel.org>, Johannes Berg
 <johannes.berg@intel.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Miri Korenblit
 <miriam.rachel.korenblit@intel.com>
Subject: linux-next: manual merge of the wireless-next tree with the
 wireless tree
Message-ID: <20240326100945.765b8caf@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/8AGzgBNmxth=6OF0Gt7NqCT";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/8AGzgBNmxth=6OF0Gt7NqCT
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

between commit:

  5f4040050553 ("wifi: iwlwifi: mvm: disable MLO for the time being")

from the wireless tree and commit:

  bbd6d0f8bc51 ("wifi: iwlwifi: mvm: advertise IEEE80211_HW_HANDLES_QUIET_C=
SA")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 8f4b063d6243,6b8f18b3e280..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@@ -359,8 -359,11 +359,11 @@@ int iwl_mvm_mac_setup_register(struct i
  	/* Set this early since we need to have it for the check below */
  	if (mvm->mld_api_is_used && mvm->nvm_data->sku_cap_11be_enable &&
  	    !iwlwifi_mod_params.disable_11ax &&
- 	    !iwlwifi_mod_params.disable_11be)
+ 	    !iwlwifi_mod_params.disable_11be) {
 -		hw->wiphy->flags |=3D WIPHY_FLAG_SUPPORTS_MLO;
 +		hw->wiphy->flags |=3D WIPHY_FLAG_DISABLE_WEXT;
+ 		/* we handle this already earlier, but need it for MLO */
+ 		ieee80211_hw_set(hw, HANDLES_QUIET_CSA);
+ 	}
 =20
  	/* With MLD FW API, it tracks timing by itself,
  	 * no need for any timing from the host

--Sig_/8AGzgBNmxth=6OF0Gt7NqCT
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYCBDkACgkQAVBC80lX
0GwPhggAh70oz9Z9zchPSUVqf6GKtUcpXQtk2/MO21QPAriY6t/pdhIn5XAqDW09
+onmxtwsW+DXvUmIaj4AmsrTliwtpLTqPoxxk9+ry23eEkjF4ukaNkDmL67TDxlN
iggW8pZfMxZzPSxG3Tr9axz0NPCToMT4g80KW8Qq1GzkrLszg4jicGVocRDgX0Sr
mW+hJDTlCqw8hqqvvy+nG1B7VmHWOx9owIOrFNLC0JyaTQiI/9XOnq/1wKg3m3Dz
pBKjHnIawJ28FQrMU8LnuX0dRrdgO30jZPwTF8SajvmwKhIECKJIp4h/YeuSIGS5
QZA8YrXJWGS9CeRl2LhTjwD7v4O4bQ==
=h+Aq
-----END PGP SIGNATURE-----

--Sig_/8AGzgBNmxth=6OF0Gt7NqCT--