linux-next: manual merge of the tip tree with the pm tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1680 bytes --]

Hi all,

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

  kernel/sched/cpufreq_schedutil.c

between commit:

  0953feed3400 ("cpufreq: schedutil: rate limits for SCHED_DEADLINE")

from the pm tree and commit:

  8f111bc357aa ("cpufreq/schedutil: Rewrite CPUFREQ_RT support")

from the tip 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.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/sched/cpufreq_schedutil.c
index 04d3fe9ba7d2,89fe78ecb88c..000000000000
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@@ -280,11 -276,9 +286,11 @@@ static void sugov_update_single(struct 
  	unsigned int next_f;
  	bool busy;
  
- 	sugov_set_iowait_boost(sg_cpu, time);
+ 	sugov_set_iowait_boost(sg_cpu, time, flags);
  	sg_cpu->last_update = time;
  
 +	ignore_dl_rate_limit(sg_cpu, sg_policy);
 +
  	if (!sugov_should_update_freq(sg_policy, time))
  		return;
  
@@@ -366,12 -353,7 +365,9 @@@ sugov_update_shared(struct update_util_
  
  	raw_spin_lock(&sg_policy->update_lock);
  
 +	ignore_dl_rate_limit(sg_cpu, sg_policy);
 +
- 	sugov_get_util(sg_cpu);
- 	sg_cpu->flags = flags;
- 
- 	sugov_set_iowait_boost(sg_cpu, time);
+ 	sugov_set_iowait_boost(sg_cpu, time, flags);
  	sg_cpu->last_update = time;
  
  	if (sugov_should_update_freq(sg_policy, time)) {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]