tree 28d629439a846eac733ab525a0d2d4a8e6a1649c
parent 1630e843e104528ddf0208dfc692c70c9bd05a89
parent f7d665627e103e82d34306c7d3f6f46f387c0d8b
author Linus Torvalds <torvalds@linux-foundation.org> 1470488675 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> 1470488675 -0400

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
 "Two fixes and a cleanup-fix, to the syscall entry code and to ptrace"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/syscalls/64: Add compat_sys_keyctl for 32-bit userspace
  x86/ptrace: Stop setting TS_COMPAT in ptrace code
  x86/vdso: Error out if the vDSO isn't a valid DSO