Merge tag 'v3.10.96' into update

This is the 3.10.96 stable release

diff --cc Makefile
Simple merge

diff --cc arch/arm64/kernel/ptrace.c
index 1e0bcd6a9f5b002c5be43479644a80112da26f17,dfad98fda4f83f25872ad5fcd4d955d745e0832f..20060334d87eb587492a6c6cecabd5b094815aa3
--- 1/arch/arm64/kernel/ptrace.c
--- 2/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@@ -58,8 -51,36 +58,14 @@@
   */
  void ptrace_disable(struct task_struct *child)
  {
+       /*
+        * This would be better off in core code, but PTRACE_DETACH has
+        * grown its fair share of arch-specific worts and changing it
+        * is likely to cause regressions on obscure architectures.
+        */
+       user_disable_single_step(child);
  }
  
 -/*
 - * Handle hitting a breakpoint.
 - */
 -static int ptrace_break(struct pt_regs *regs)
 -{
 -      siginfo_t info = {
 -              .si_signo = SIGTRAP,
 -              .si_errno = 0,
 -              .si_code  = TRAP_BRKPT,
 -              .si_addr  = (void __user *)instruction_pointer(regs),
 -      };
 -
 -      force_sig_info(SIGTRAP, &info, current);
 -      return 0;
 -}
 -
 -static int arm64_break_trap(unsigned long addr, unsigned int esr,
 -                          struct pt_regs *regs)
 -{
 -      return ptrace_break(regs);
 -}
 -
  #ifdef CONFIG_HAVE_HW_BREAKPOINT
  /*
   * Handle hitting a HW-breakpoint.

diff --cc arch/arm64/mm/mmu.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/net/ppp/ppp_generic.c
Simple merge

diff --cc drivers/usb/host/xhci.c
index f6b22759626ec4bb8a967e93f91819340612716c,4dc18615cd0f5ee54b96d84838fd6ce7c01628a3..1316a03c1a43097ed6ee88750e230aa01ae9c1c2
--- 1/drivers/usb/host/xhci.c
--- 2/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@@ -5147,12 -4815,11 +5155,16 @@@ static int __init xhci_hcd_init(void
        BUILD_BUG_ON(sizeof(struct xhci_intr_reg) != 8*32/8);
        /* xhci_run_regs has eight fields and embeds 128 xhci_intr_regs */
        BUILD_BUG_ON(sizeof(struct xhci_run_regs) != (8+8*128)*32/8);
+ 
+       if (usb_disabled())
+               return -ENODEV;
+ 
        return 0;
 +
 +#ifdef CONFIG_MTK_XHCI
 +unreg_plat:
 +    xhci_unregister_plat();
 +#endif
  unreg_pci:
        xhci_unregister_pci();
        return retval;

diff --cc include/linux/sched.h
Simple merge

diff --cc include/linux/syscalls.h
Simple merge

diff --cc net/unix/af_unix.c
Simple merge

diff --cc scripts/recordmcount.pl
Simple merge

diff --cc sound/core/timer.c
Simple merge