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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <82e78ebf5f84314e3fc1e6b8b1a76f948c9aeb22.camel@sipsolutions.net>
Date: Tue, 13 Feb 2024 18:13:57 +0100
From: Johannes Berg <johannes@...solutions.net>
To: "Wysocki, Rafael J" <rafael.j.wysocki@...el.com>, Stephen Rothwell
	 <sfr@...b.auug.org.au>, Kalle Valo <kvalo@...nel.org>, Wireless
	 <linux-wireless@...r.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Miri Korenblit
 <miriam.rachel.korenblit@...el.com>, "Rafael J. Wysocki"
 <rjw@...ysocki.net>, "Rafael J. Wysocki" <rafael@...nel.org>
Subject: Re: linux-next: manual merge of the wireless-next tree with the pm
 tree

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