Received-SPF: pass (google.com: domain of linux-wireless+bounces-3514-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <4044e07e87af766f643f89f839b332973819e048.camel@sipsolutions.net>
Subject: Re: linux-next: manual merge of the wireless-next tree with the pm
 tree
From: Johannes Berg <johannes@sipsolutions.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Kalle Valo <kvalo@kernel.org>, 
 Wireless <linux-wireless@vger.kernel.org>, "Rafael J. Wysocki"
 <rjw@rjwysocki.net>
Cc: 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>, "Rafael J. Wysocki"
 <rafael.j.wysocki@intel.com>
Date: Tue, 13 Feb 2024 09:25:43 +0100
In-Reply-To: <20240213110852.51524899@canb.auug.org.au>
References: <20240213110852.51524899@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

On Tue, 2024-02-13 at 11:08 +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/mvm.h
>=20
> between commit:
>=20
>   2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_mvm_=
thermal_device")
>=20
> from the pm tree and commit:
>=20
>   8cb3a308ceb1 ("wifi: iwlwifi: mvm: fix thermal kernel-doc")
>=20
> from the wireless-next tree.

Hah, sorry about that. I told Rafael this was likely not going to
conflict, but didn't see the doc changes ...

I guess we'll have to live with this conflict, unless Rafael you have a
feature branch for this I could pull in and resolve?

johannes