Subject: linux-next: manual merge of the userns tree with the arm64 tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 28 Sep 2018 13:49:29 +1000

Hi Eric,

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

  arch/arm64/kernel/traps.c

between commit:

  8a60419d3676 ("arm64: force_signal_inject: WARN if called from kernel context")

from the arm64 tree and commit:

  6fa998e83ef9 ("signal/arm64: Push siginfo generation into arm64_notify_die")

from the userns 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/arm64/kernel/traps.c
index 21689c6a985f,856b32aa03d8..000000000000
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@@ -353,12 -366,6 +368,9 @@@ void force_signal_inject(int signal, in
  	const char *desc;
  	struct pt_regs *regs = current_pt_regs();
  
 +	if (WARN_ON(!user_mode(regs)))
 +		return;
 +
- 	clear_siginfo(&info);
- 
  	switch (signal) {
  	case SIGILL:
  		desc = "undefined instruction";