Merge tag 'v4.9.81' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.9-stable
[email protected] Sat, 16 Jun 2018 06:27:04 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994721AbeFPE1GQ-fYJ/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 21:48:17 2018 +0200 Commit: 0339c0a5cc5fd65d12dcb9c580846e5791f84fb0 Gitweb: https://git.linux-mips.org/g/ralf/linux/0339c0a5cc5f Branch: linux-4.9-stable --- Documentation/kernel-parameters.txt | 2 Documentation/speculation.txt | 90 ++ Makefile | 2 arch/powerpc/Kconfig | 1 arch/powerpc/include/asm/exception-64e.h | 6 arch/powerpc/include/asm/exception-64s.h | 53 + arch/powerpc/include/asm/feature-fixups.h | 15 arch/powerpc/include/asm/hvcall.h | 17 arch/powerpc/include/asm/paca.h | 10 arch/powerpc/include/asm/plpar_wrappers.h | 14 arch/powerpc/include/asm/setup.h | 13 arch/powerpc/kernel/asm-offsets.c | 4 arch/powerpc/kernel/entry_64.S | 30 + arch/powerpc/kernel/exceptions-64s.S | 108 +++ arch/powerpc/kernel/setup_64.c | 139 ++++ arch/powerpc/kernel/vmlinux.lds.S | 9 arch/powerpc/lib/feature-fixups.c | 42 + arch/powerpc/platforms/powernv/setup.c | 50 + arch/powerpc/platforms/pseries/setup.c | 35 + arch/x86/entry/common.c | 9 arch/x86/entry/entry_32.S | 3 arch/x86/entry/entry_64.S | 134 ---- arch/x86/entry/syscall_64.c | 7 arch/x86/events/intel/bts.c | 44 + arch/x86/include/asm/asm-prototypes.h | 4 arch/x86/include/asm/asm.h | 4 arch/x86/include/asm/barrier.h | 28 + arch/x86/include/asm/cpufeature.h | 7 arch/x86/include/asm/cpufeatures.h | 22 - arch/x86/include/asm/disabled-features.h | 3 arch/x86/include/asm/intel-family.h | 7 arch/x86/include/asm/msr-index.h | 12 arch/x86/include/asm/msr.h | 3 arch/x86/include/asm/nospec-branch.h | 91 +- arch/x86/include/asm/pgalloc.h | 11 arch/x86/include/asm/pgtable.h | 6 arch/x86/include/asm/processor.h | 2 arch/x86/include/asm/required-features.h | 3 arch/x86/include/asm/syscall.h | 6 arch/x86/include/asm/thread_info.h | 3 arch/x86/include/asm/uaccess.h | 15 arch/x86/include/asm/uaccess_32.h | 12 arch/x86/include/asm/uaccess_64.h | 12 arch/x86/kernel/alternative.c | 14 arch/x86/kernel/cpu/bugs.c | 128 ++- arch/x86/kernel/cpu/common.c | 70 ++ arch/x86/kernel/cpu/intel.c | 66 ++ arch/x86/kernel/cpu/microcode/core.c | 47 + arch/x86/kernel/cpu/scattered.c | 2 arch/x86/kernel/process_64.c | 4 arch/x86/kernel/ptrace.c | 2 arch/x86/kernel/signal.c | 2 arch/x86/kernel/tboot.c | 10 arch/x86/kvm/cpuid.c | 21 - arch/x86/kvm/cpuid.h | 31 + arch/x86/kvm/emulate.c | 10 arch/x86/kvm/svm.c | 116 +++ arch/x86/kvm/vmx.c | 763 ++++++++++---------- arch/x86/kvm/x86.c | 1 arch/x86/lib/Makefile | 1 arch/x86/lib/getuser.S | 10 arch/x86/lib/retpoline.S | 57 + arch/x86/lib/usercopy_32.c | 8 crypto/tcrypt.c | 6 drivers/auxdisplay/img-ascii-lcd.c | 4 drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 55 + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 8 drivers/media/platform/soc_camera/soc_scale_crop.c | 4 .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 18 drivers/net/ethernet/realtek/r8169.c | 4 drivers/net/usb/qmi_wwan.c | 1 drivers/net/wireless/broadcom/b43/main.c | 10 drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 4 drivers/tty/serial/serial_core.c | 2 drivers/vhost/net.c | 1 include/linux/fdtable.h | 5 include/linux/init.h | 9 include/linux/module.h | 9 include/linux/nospec.h | 72 ++ kernel/module.c | 11 net/core/sock_reuseport.c | 35 + net/ipv4/igmp.c | 4 net/ipv4/tcp.c | 6 net/ipv4/tcp_bbr.c | 6 net/ipv6/af_inet6.c | 11 net/ipv6/ip6mr.c | 1 net/sched/cls_u32.c | 12 net/wireless/nl80211.c | 9 scripts/mod/modpost.c | 9 security/keys/encrypted-keys/encrypted.c | 31 - sound/soc/codecs/pcm512x-spi.c | 4 sound/soc/generic/simple-card.c | 8 sound/soc/sh/rcar/ssi.c | 5 93 files changed, 2026 insertions(+), 789 deletions(-)