Merge tag 'v3.2.101' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-3.2-stable
[email protected] Sat, 16 Jun 2018 06:23:33 +0200
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994679AbeFPEXfb5P26/[email protected]> |
Author: Ralf Baechle <[email protected]> Tue May 15 22:05:59 2018 +0200 Commit: cbbce9dedd2a5b78bcb6d283c48e6da8e3f91d5e Gitweb: https://git.linux-mips.org/g/ralf/linux/cbbce9dedd2a Branch: linux-3.2-stable --- Documentation/ABI/testing/sysfs-devices-system-cpu | 16 + Documentation/gcov.txt | 4 Documentation/kernel-parameters.txt | 51 +- Documentation/speculation.txt | 90 +++ Documentation/x86/pti.txt | 186 +++++++ Makefile | 4 arch/cris/arch-v10/lib/Makefile | 3 arch/x86/Kconfig | 14 arch/x86/Makefile | 8 arch/x86/ia32/ia32entry.S | 54 +- arch/x86/include/asm/alternative-asm.h | 19 + arch/x86/include/asm/alternative.h | 24 + arch/x86/include/asm/asm.h | 17 + arch/x86/include/asm/bitops.h | 2 arch/x86/include/asm/cpufeature.h | 22 + arch/x86/include/asm/intel-family.h | 68 ++ arch/x86/include/asm/msr-index.h | 3 arch/x86/include/asm/msr.h | 2 arch/x86/include/asm/nospec-branch.h | 199 +++++++ arch/x86/include/asm/processor.h | 6 arch/x86/include/asm/system.h | 68 ++ arch/x86/include/asm/thread_info.h | 3 arch/x86/include/asm/uaccess.h | 8 arch/x86/include/asm/uaccess_32.h | 12 arch/x86/include/asm/uaccess_64.h | 22 + arch/x86/include/asm/xen/hypercall.h | 5 arch/x86/kernel/alternative.c | 31 - 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 | 34 + arch/x86/kernel/entry_32.S | 24 + arch/x86/kernel/entry_64.S | 31 + arch/x86/kernel/irq_32.c | 9 arch/x86/kernel/kprobes.c | 23 + arch/x86/kernel/vmlinux.lds.S | 7 arch/x86/kvm/svm.c | 69 ++ arch/x86/kvm/vmx.c | 110 ++-- arch/x86/lib/Makefile | 2 arch/x86/lib/checksum_32.S | 7 arch/x86/lib/getuser.S | 8 arch/x86/lib/msr.c | 89 +++ arch/x86/lib/retpoline-export.c | 25 + arch/x86/lib/retpoline.S | 45 ++ arch/x86/lib/usercopy_32.c | 5 drivers/base/Kconfig | 3 drivers/base/cpu.c | 49 ++ drivers/edac/mce_amd.h | 2 drivers/hv/hv.c | 25 + drivers/media/common/tuners/max2165.c | 9 drivers/media/dvb/frontends/tda8261_cfg.h | 2 drivers/net/ethernet/realtek/atp.c | 58 -- drivers/net/ethernet/realtek/atp.h | 2 drivers/net/wireless/ath/ath6kl/hif.h | 2 drivers/net/wireless/ath/ath6kl/sdio.c | 4 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 3 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 5 drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 6 drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 3 drivers/staging/wlan-ng/p80211netdev.c | 2 drivers/usb/renesas_usbhs/mod_gadget.c | 6 drivers/usb/renesas_usbhs/mod_host.c | 6 drivers/usb/renesas_usbhs/pipe.h | 6 fs/compat.c | 10 fs/compat_ioctl.c | 1 fs/internal.h | 2 fs/namespace.c | 26 - include/linux/bitops.h | 3 include/linux/cpu.h | 7 include/linux/fdtable.h | 5 include/linux/init.h | 9 include/linux/kaiser.h | 2 include/linux/kconfig.h | 23 + include/linux/module.h | 9 include/linux/nospec.h | 59 ++ include/net/bluetooth/hci_core.h | 1 kernel/gcov/Kconfig | 30 + kernel/gcov/Makefile | 32 + kernel/gcov/base.c | 38 + kernel/gcov/fs.c | 27 + kernel/gcov/gcc_3_4.c | 115 ++++ kernel/gcov/gcc_4_7.c | 565 ++++++++++++++++++++ kernel/gcov/gcov.h | 65 -- kernel/kprobes.c | 10 kernel/module.c | 11 net/bluetooth/hci_conn.c | 16 - scripts/mod/modpost.c | 58 ++ security/selinux/ss/services.c | 54 +- 90 files changed, 2688 insertions(+), 478 deletions(-)