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

[Viresh Kumar]

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