linux-next: manual merge of the s390 tree with the mm-nonmm-stable tree

[Mark Brown]

Hi all,

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

  arch/s390/kernel/traps.c

between commit:

  ed26d6fcf5631 ("s390: implement arch_do_panic")

from the mm-nonmm-stable tree and commit:

  5cc8fe84f9117 ("s390/entry: Save lowcore on invalid kernel stack")

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.

diff --cc arch/s390/kernel/traps.c
index 115cb33732476,6b083b9584eb0..0000000000000
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@@ -26,7 -26,7 +26,8 @@@
  #include <linux/entry-common.h>
  #include <linux/kmsan.h>
  #include <linux/bug.h>
 +#include <linux/panic.h>
+ #include <asm/pgmcheck-defs.h>
  #include <asm/entry-percpu.h>
  #include <asm/asm-extable.h>
  #include <asm/irqflags.h>
@@@ -285,11 -290,12 +292,17 @@@ static void monitor_event_exception(str
  	}
  }
  
 +void arch_do_panic(void)
 +{
 +	disabled_wait();
 +}
 +
+ /*
+  * Content of the faulting CPU's lowcore, copied by stack_invalid().
+  */
+ struct lowcore stack_invalid_lowcore;
+ int stack_invalid_lowcore_used;
+ 
  void kernel_stack_invalid(struct pt_regs *regs)
  {
  	/*

Attachment: signature.asc
Description: PGP signature