Re: linux-next: manual merge of the wireless-next tree with the pm tree

[Johannes Berg]

On Tue, 2024-02-13 at 18:03 +0100, Wysocki, Rafael J wrote:
> > > 
> > >    2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_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.

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

johannes