Received-SPF: pass (google.com: domain of linux-wireless+bounces-3561-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Precedence: bulk
MIME-Version: 1.0
References: <20240213110852.51524899@canb.auug.org.au> <4044e07e87af766f643f89f839b332973819e048.camel@sipsolutions.net>
 <e15b25c2-2ced-4f79-b541-61980a31f947@intel.com> <82e78ebf5f84314e3fc1e6b8b1a76f948c9aeb22.camel@sipsolutions.net>
In-Reply-To: <82e78ebf5f84314e3fc1e6b8b1a76f948c9aeb22.camel@sipsolutions.net>
From: "Rafael J. Wysocki" <rafael@kernel.org>
Date: Tue, 13 Feb 2024 18:34:25 +0100
Message-ID: <CAJZ5v0iQvOnO0FffGHVzTOrTVdfAB6jaFYgsKL1ep7BnOz0m9A@mail.gmail.com>
Subject: Re: linux-next: manual merge of the wireless-next tree with the pm tree
To: Johannes Berg <johannes@sipsolutions.net>
Cc: "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>, 
	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>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, Feb 13, 2024 at 6:14=E2=80=AFPM Johannes Berg <johannes@sipsolution=
s.net> wrote:
>
> On Tue, 2024-02-13 at 18:03 +0100, Wysocki, Rafael J wrote:
> > > >
> > > >    2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from i=
wl_mvm_thermal_device")
> > > >
> > > > 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?
> >
> > Well, not yet, but I can add one if that helps.
> >
>
> 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.

On top of 6.8-rc2, there are 3 unrelated commits that you'd need to
merge along with the wireless ones.  Your call. :-)

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

Agreed.