Merge tag 'v3.10.71' into update
authorStricted <info@stricted.net>
Wed, 21 Mar 2018 21:40:50 +0000 (22:40 +0100)
committerStricted <info@stricted.net>
Wed, 21 Mar 2018 21:40:50 +0000 (22:40 +0100)
This is the 3.10.71 stable release

1  2 
Makefile
arch/arm64/kernel/signal32.c
drivers/tty/pty.c
drivers/usb/core/hcd.c
drivers/usb/core/usb.c
fs/binfmt_elf.c
include/linux/usb/hcd.h
kernel/debug/kdb/kdb_main.c
kernel/trace/trace.c

diff --cc Makefile
Simple merge
index e1b8b9fb274ebc4050254ace826c49760e8c3689,3d478102b1c015df01f7083ac6e3eb47022b2a00..36db9874c0b7e4cf46039e6b58980a90854701da
@@@ -209,16 -208,8 +208,16 @@@ int copy_siginfo_to_user32(compat_sigin
        case __SI_MESGQ: /* But this is */
                err |= __put_user(from->si_pid, &to->si_pid);
                err |= __put_user(from->si_uid, &to->si_uid);
-               err |= __put_user((compat_uptr_t)(unsigned long)from->si_ptr, &to->si_ptr);
+               err |= __put_user(from->si_int, &to->si_int);
                break;
 +#ifdef __ARCH_SIGSYS
 +      case __SI_SYS:
 +              err |= __put_user((compat_uptr_t)(unsigned long)
 +                              from->si_call_addr, &to->si_call_addr);
 +              err |= __put_user(from->si_syscall, &to->si_syscall);
 +              err |= __put_user(from->si_arch, &to->si_arch);
 +              break;
 +#endif
        default: /* this is just in case for now ... */
                err |= __put_user(from->si_pid, &to->si_pid);
                err |= __put_user(from->si_uid, &to->si_uid);
Simple merge
Simple merge
Simple merge
diff --cc fs/binfmt_elf.c
Simple merge
Simple merge
Simple merge
Simple merge