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: <e15b25c2-2ced-4f79-b541-61980a31f947@intel.com>
Date: Tue, 13 Feb 2024 18:03:34 +0100
From: "Wysocki, Rafael J" <rafael.j.wysocki@...el.com>
To: Johannes Berg <johannes@...solutions.net>, 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 2/13/2024 9:25 AM, Johannes Berg wrote:
> On Tue, 2024-02-13 at 11:08 +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the wireless-next tree got a conflict in:
>>
>>    drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
>>
>> between commit:
>>
>>    2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_mvm_thermal_device")
>>
>> from the pm tree and commit:
>>
>>    8cb3a308ceb1 ("wifi: iwlwifi: mvm: fix thermal kernel-doc")
>>
>> 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?

Well, not yet, but I can add one if that helps.

Cheers!