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

[Stephen Rothwell]

Hi all,

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

  arch/s390/kernel/idle.c

between commit:

  c01016299dc7 ("s390/idle: move idle time accounting to account_idle_time_irq()")

from the s390 tree and commit:

  89b3098703bd ("arch/idle: Change arch_cpu_idle() behavior: always exit with IRQs disabled")

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 arch/s390/kernel/idle.c
index dd8351e76539,b04fb418307c..000000000000
--- a/arch/s390/kernel/idle.c
+++ b/arch/s390/kernel/idle.c
@@@ -61,7 -57,15 +61,6 @@@ void noinstr arch_cpu_idle(void
  
  	/* psw_idle() returns with interrupts disabled. */
  	psw_idle(idle, psw_mask);
- 	raw_local_irq_enable();
 -
 -	/* Account time spent with enabled wait psw loaded as idle time. */
 -	raw_write_seqcount_begin(&idle->seqcount);
 -	idle_time = idle->clock_idle_exit - idle->clock_idle_enter;
 -	idle->clock_idle_enter = idle->clock_idle_exit = 0ULL;
 -	idle->idle_time += idle_time;
 -	idle->idle_count++;
 -	account_idle_time(cputime_to_nsecs(idle_time));
 -	raw_write_seqcount_end(&idle->seqcount);
  }
  
  static ssize_t show_idle_count(struct device *dev,

Attachment: pgpYbIvEmeFCB.pgp
Description: OpenPGP digital signature