linux-kernel - Re: linux-next: manual merge of the cpufreq-arm 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] [day] [month] [year] [list]

Message-ID: <20250206033555.q24q36txif37hzgu@vireshk-i7>
Date: Thu, 6 Feb 2025 09:05:55 +0530
From: Viresh Kumar <viresh.kumar@...aro.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: "Rafael J. Wysocki" <rjw@...ysocki.net>,
	Aboorva Devarajan <aboorvad@...ux.ibm.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>
Subject: Re: linux-next: manual merge of the cpufreq-arm tree with the pm tree

On 06-02-25, 11:50, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the cpufreq-arm tree got a conflict in:
> 
>   drivers/cpufreq/cpufreq.c
> 
> between commit:
> 
>   0813fd2e14ca ("cpufreq: prevent NULL dereference in cpufreq_online()")
> 
> from the pm tree and commit:
> 
>   60208a700f76 ("cpufreq: Restrict enabling boost on policies with no boost frequencies")
> 
> from the cpufreq-arm tree.

Fixed now.

-- 
viresh