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

[Mark Brown]

Hi all,

Today's linux-next merge of the cpufreq-arm tree got a conflict in:

  drivers/cpufreq/cppc_cpufreq.c

between commit:

  995e7d4680706 ("cpufreq: CPPC: Create the FIE worker before enabling PCC callbacks")

from the pm tree and commit:

  d82d896f00e7b ("cpufreq: Use %pe to print error pointers symbolically")

from the cpufreq-arm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/cpufreq/cppc_cpufreq.c
index 09e55bfdca885,f767898ebfb57..0000000000000
--- a/drivers/cpufreq/cppc_cpufreq.c
+++ b/drivers/cpufreq/cppc_cpufreq.c
@@@ -240,19 -228,16 +240,19 @@@ static int cppc_fie_kworker_init(void
  	};
  	int ret;
  
 -	kworker_fie = kthread_run_worker(0, "cppc_fie");
 -	if (IS_ERR(kworker_fie)) {
 +	guard(mutex)(&cppc_fie_lock);
 +
 +	if (kworker_fie)
 +		return 0;
 +
 +	worker = kthread_run_worker(0, "cppc_fie");
 +	if (IS_ERR(worker)) {
- 		pr_warn("%s: failed to create kworker_fie: %ld\n", __func__,
- 			PTR_ERR(worker));
+ 		pr_warn("%s: failed to create kworker_fie: %pe\n", __func__,
 -			kworker_fie);
 -		fie_disabled = FIE_DISABLED;
 -		kworker_fie = NULL;
 -		return;
++			worker);
 +		return PTR_ERR(worker);
  	}
  
 -	ret = sched_setattr_nocheck(kworker_fie->task, &attr);
 +	ret = sched_setattr_nocheck(worker->task, &attr);
  	if (ret) {
  		pr_warn("%s: failed to set SCHED_DEADLINE: %d\n", __func__,
  			ret);

Attachment: signature.asc
Description: PGP signature