Merge tag 'v3.16.56' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.16-stable
[email protected] Thu, 21 Jun 2018 15:12:30 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23992615AbeFUNMc6Q7aB/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Jun 21 14:36:53 2018 +0200 Commit: fb2267dd2dc9814afdf9f77fff8a2f3daf873fc3 Gitweb: https://git.linux-mips.org/g/ralf/linux/fb2267dd2dc9 Branch: linux-3.16-stable --- Documentation/ABI/testing/sysfs-devices-system-cpu | 16 + Documentation/kernel-parameters.txt | 51 +++ Documentation/speculation.txt | 90 ++++++ Documentation/x86/pti.txt | 186 ++++++++++++ Makefile | 2 arch/x86/Kconfig | 14 + arch/x86/Makefile | 8 + arch/x86/crypto/aesni-intel_asm.S | 5 arch/x86/crypto/camellia-aesni-avx-asm_64.S | 3 arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 3 arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 3 arch/x86/ia32/ia32entry.S | 54 +++- arch/x86/include/asm/alternative-asm.h | 14 + arch/x86/include/asm/alternative.h | 20 + arch/x86/include/asm/asm.h | 11 + arch/x86/include/asm/barrier.h | 31 ++ arch/x86/include/asm/cpufeature.h | 8 + arch/x86/include/asm/intel-family.h | 68 +++++ arch/x86/include/asm/nospec-branch.h | 198 +++++++++++++ arch/x86/include/asm/processor.h | 6 arch/x86/include/asm/switch_to.h | 38 +++ arch/x86/include/asm/uaccess.h | 64 +++- arch/x86/include/asm/uaccess_32.h | 24 ++ arch/x86/include/asm/uaccess_64.h | 94 ++++-- arch/x86/include/asm/xen/hypercall.h | 5 arch/x86/include/uapi/asm/msr-index.h | 3 arch/x86/kernel/alternative.c | 29 +- arch/x86/kernel/cpu/Makefile | 4 arch/x86/kernel/cpu/amd.c | 28 ++ arch/x86/kernel/cpu/bugs.c | 299 ++++++++++++++++++++ arch/x86/kernel/cpu/bugs_64.c | 33 -- arch/x86/kernel/cpu/common.c | 32 +- arch/x86/kernel/cpu/microcode/intel.c | 2 arch/x86/kernel/cpu/proc.c | 4 arch/x86/kernel/entry_32.S | 25 +- arch/x86/kernel/entry_64.S | 29 +- arch/x86/kernel/irq_32.c | 16 - arch/x86/kernel/kprobes/opt.c | 23 +- arch/x86/kernel/mcount_64.S | 8 - arch/x86/kernel/vmlinux.lds.S | 6 arch/x86/kvm/emulate.c | 9 - arch/x86/kvm/svm.c | 23 ++ arch/x86/kvm/vmx.c | 46 ++- arch/x86/lib/Makefile | 2 arch/x86/lib/checksum_32.S | 7 arch/x86/lib/getuser.S | 10 + arch/x86/lib/retpoline-export.c | 24 ++ arch/x86/lib/retpoline.S | 47 +++ arch/x86/lib/usercopy_32.c | 20 + drivers/base/Kconfig | 3 drivers/base/cpu.c | 48 +++ drivers/hv/hv.c | 25 +- include/linux/cpu.h | 7 include/linux/fdtable.h | 5 include/linux/init.h | 9 + include/linux/kaiser.h | 2 include/linux/kconfig.h | 9 - include/linux/module.h | 9 + include/linux/nospec.h | 59 ++++ kernel/module.c | 11 + net/wireless/nl80211.c | 9 - scripts/mod/modpost.c | 9 + 62 files changed, 1710 insertions(+), 240 deletions(-)