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

Hi Srikar,

Today's linux-next merge of the uprobes tree got a conflict in
arch/x86/kernel/traps.c between commit c94082656dac ("x86: Use enum
instead of literals for trap values") from the tip tree and commit
b6d8245ec899 ("x86/trivial: rename trap_no to trap_nr in thread struct")
from the uprobes tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/kernel/traps.c
index 4310189,993f52f..0000000

--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c

@@@ -238,10 -233,10 +238,10 @@@ dotraplinkage void do_double_fault(stru
  	struct task_struct *tsk = current;
  
  	/* Return not checked because double check cannot be ignored */
 -	notify_die(DIE_TRAP, str, regs, error_code, 8, SIGSEGV);
 +	notify_die(DIE_TRAP, str, regs, error_code, X86_TRAP_DF, SIGSEGV);
  
  	tsk->thread.error_code = error_code;
- 	tsk->thread.trap_no = X86_TRAP_DF;
 -	tsk->thread.trap_nr = 8;
++	tsk->thread.trap_nr = X86_TRAP_DF;
  
  	/*
  	 * This is always a kernel trap and never fixable (and thus must
@@@ -269,7 -264,7 +269,7 @@@ do_general_protection(struct pt_regs *r
  		goto gp_in_kernel;
  
  	tsk->thread.error_code = error_code;
- 	tsk->thread.trap_no = X86_TRAP_GP;
 -	tsk->thread.trap_nr = 13;
++	tsk->thread.trap_nr = X86_TRAP_GP;
  
  	if (show_unhandled_signals && unhandled_signal(tsk, SIGSEGV) &&
  			printk_ratelimit()) {
@@@ -296,9 -291,9 +296,9 @@@ gp_in_kernel
  		return;
  
  	tsk->thread.error_code = error_code;
- 	tsk->thread.trap_no = X86_TRAP_GP;
 -	tsk->thread.trap_nr = 13;
 -	if (notify_die(DIE_GPF, "general protection fault", regs,
 -				error_code, 13, SIGSEGV) == NOTIFY_STOP)
++	tsk->thread.trap_nr = X86_TRAP_GP;
 +	if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
 +			X86_TRAP_GP, SIGSEGV) == NOTIFY_STOP)
  		return;
  	die("general protection fault", regs, error_code);
  }