Subject: linux-next: manual merge of the s390 tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 29 May 2020 10:10:47 +1000

Hi all,

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

  arch/s390/kernel/smp.c

between commit:

  8ebf6da9db1b ("s390/ftrace: fix potential crashes when switching tracers")

from Linus' tree and commit:

  11886c199d8d ("s390: add machine check SIGP")

from the s390 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/smp.c
index 10dbb12eb14d,fc1041257c60..000000000000
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@@ -403,7 -404,12 +404,12 @@@ int smp_find_processor_id(u16 address
  	return -1;
  }
  
+ void schedule_mcck_handler(void)
+ {
+ 	pcpu_ec_call(pcpu_devices + smp_processor_id(), ec_mcck_pending);
+ }
+ 
 -bool arch_vcpu_is_preempted(int cpu)
 +bool notrace arch_vcpu_is_preempted(int cpu)
  {
  	if (test_cpu_flag_of(CIF_ENABLED_WAIT, cpu))
  		return false;