Received-SPF: pass (google.com: domain of linux-kernel+bounces-59055-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <e42a9ad67eada684fc1ee3d272774248ead9ae26.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>, Daniel Gabay
 <daniel.gabay@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>
Date: Fri, 09 Feb 2024 08:03:42 +0100
In-Reply-To: <20240209105606.66e7808b@canb.auug.org.au>
References: <20240209105606.66e7808b@canb.auug.org.au>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.50.3 (3.50.3-1.fc39) 
Precedence: bulk
MIME-Version: 1.0

Hi,

Thanks for the heads-up!

On Fri, 2024-02-09 at 10:56 +1100, Stephen Rothwell wrote:
> Hi all,
>=20
> Today's linux-next merge of the wireless-next tree got a conflict in:
>=20
>   drivers/net/wireless/intel/iwlwifi/mvm/tx.c
>=20
> between commit:
>=20
>   2e57b77583ca ("wifi: iwlwifi: mvm: use correct address 3 in A-MSDU")
>=20
> from the wireless tree and commit:
>=20
>   3d869feacb74 ("wifi: iwlwifi: mvm: use FW rate for non-data only on new=
 devices")

I had a different (potential) conflict on my radar and pulled wireless
into wireless-next to avoid it, but this one wasn't on my radar at all.
Sorry about that.

> I fixed it up (see below)

That obviously looks fine, thanks!

johannes