Received-SPF: pass (google.com: domain of linux-kernel+bounces-63969-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: <82e78ebf5f84314e3fc1e6b8b1a76f948c9aeb22.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: "Wysocki, Rafael J" <rafael.j.wysocki@intel.com>, Stephen Rothwell
	 <sfr@canb.auug.org.au>, Kalle Valo <kvalo@kernel.org>, Wireless
	 <linux-wireless@vger.kernel.org>
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"
 <rjw@rjwysocki.net>, "Rafael J. Wysocki" <rafael@kernel.org>
Date: Tue, 13 Feb 2024 18:13:57 +0100
In-Reply-To: <e15b25c2-2ced-4f79-b541-61980a31f947@intel.com>
References: <20240213110852.51524899@canb.auug.org.au>
	 <4044e07e87af766f643f89f839b332973819e048.camel@sipsolutions.net>
	 <e15b25c2-2ced-4f79-b541-61980a31f947@intel.com>
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 18:03 +0100, Wysocki, Rafael J wrote:
> > >=20
> > >    2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from iwl=
_mvm_thermal_device")
> > >=20
> > > from the pm tree

> > 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?
>=20
> Well, not yet, but I can add one if that helps.
>=20

Well if you have a branch that has the above commit and not too much
else, then I could pull it into wireless ... but chances are the common
base that we have is divergent enough that'd pull a whole bunch of other
things into the tree so that'd not be great.

Pretty sure even if the conflict survives to the end Linus could figure
it out? :)

johannes