Received-SPF: pass (google.com: domain of linux-wireless+bounces-5272-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <49041c649349a3b252118f9bb26521e5d47c82b1.camel@sipsolutions.net>
Subject: Re: linux-next: manual merge of the wireless-next tree with the
 wireless tree
From: Johannes Berg <johannes@sipsolutions.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Kalle Valo <kvalo@kernel.org>
Cc: Wireless <linux-wireless@vger.kernel.org>, 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>
Date: Tue, 26 Mar 2024 08:58:36 +0100
In-Reply-To: <20240326100945.765b8caf@canb.auug.org.au>
References: <20240326100945.765b8caf@canb.auug.org.au>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.50.4 (3.50.4-1.fc39) 
Precedence: bulk
MIME-Version: 1.0

Hi Stephen,

Thanks for the heads-up.

> between commit:
>=20
>   5f4040050553 ("wifi: iwlwifi: mvm: disable MLO for the time being")
>=20
> from the wireless tree and commit:
>=20
>   bbd6d0f8bc51 ("wifi: iwlwifi: mvm: advertise IEEE80211_HW_HANDLES_QUIET=
_CSA")
>=20
> from the wireless-next tree.

I kind of knew this was going to happen (given how the patches applied
or rather didn't), but nothing to prevent it yet. I think we'll get it
fixed in due time,=C2=A0before all the -next stuff goes anywhere.

Thanks,
johannes