Merge tag 'v4.4.113' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.4-stable
[email protected] Fri, 02 Feb 2018 13:21:02 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23994855AbeBBMVEiLmXP/[email protected]> |
Author: Ralf Baechle <[email protected]> Fri Feb 2 12:59:16 2018 +0100 Commit: 8011277d0544e80b923c222b97c29672ef1913b1 Gitweb: https://git.linux-mips.org/g/ralf/linux/8011277d0544 Branch: linux-4.4-stable --- Documentation/kernel-parameters.txt | 28 ++++ Documentation/x86/pti.txt | 2 Makefile | 2 arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 10 + arch/arm64/kvm/handle_exit.c | 4 - arch/mips/ar7/platform.c | 2 arch/x86/Kconfig | 13 ++ 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/entry/entry_32.S | 11 + arch/x86/entry/entry_64.S | 16 ++ arch/x86/include/asm/alternative.h | 4 + arch/x86/include/asm/asm-prototypes.h | 41 +++++ arch/x86/include/asm/asm.h | 11 + arch/x86/include/asm/cpufeature.h | 2 arch/x86/include/asm/msr-index.h | 3 arch/x86/include/asm/nospec-branch.h | 198 ++++++++++++++++++++++++++ arch/x86/include/asm/thread_info.h | 11 - arch/x86/include/asm/traps.h | 1 arch/x86/include/asm/xen/hypercall.h | 5 - arch/x86/kernel/apic/vector.c | 7 + arch/x86/kernel/cpu/amd.c | 28 +++- arch/x86/kernel/cpu/bugs.c | 166 +++++++++++++++++++++- arch/x86/kernel/cpu/common.c | 12 +- arch/x86/kernel/cpu/mcheck/mce.c | 5 + arch/x86/kernel/irq_32.c | 15 +- arch/x86/kernel/kprobes/opt.c | 23 +++ arch/x86/kernel/mcount_64.S | 7 + arch/x86/kernel/traps.c | 2 arch/x86/kernel/vmlinux.lds.S | 7 + arch/x86/kvm/svm.c | 4 + arch/x86/kvm/vmx.c | 4 + arch/x86/lib/Makefile | 1 arch/x86/lib/checksum_32.S | 7 + arch/x86/lib/retpoline.S | 49 ++++++ drivers/ata/libata-core.c | 1 drivers/hv/hv.c | 11 + drivers/input/misc/twl4030-vibra.c | 6 + drivers/input/misc/twl6040-vibra.c | 2 drivers/input/touchscreen/88pm860x-ts.c | 16 ++ drivers/md/dm-thin-metadata.c | 6 + drivers/md/persistent-data/dm-btree.c | 19 -- drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 21 +-- drivers/phy/phy-core.c | 4 + drivers/scsi/hpsa.c | 1 drivers/scsi/sg.c | 30 +--- fs/pipe.c | 18 ++ include/asm-generic/asm-prototypes.h | 7 + include/asm-generic/export.h | 94 ++++++++++++ include/linux/kconfig.h | 11 + include/linux/vermagic.h | 8 + include/scsi/sg.h | 1 kernel/futex.c | 3 kernel/gcov/Kconfig | 1 kernel/sched/deadline.c | 2 kernel/trace/trace_events.c | 16 ++ net/key/af_key.c | 8 + scripts/Makefile.build | 87 +++++++++++ sound/core/pcm_lib.c | 1 sound/pci/hda/patch_cirrus.c | 1 sound/pci/hda/patch_realtek.c | 1 64 files changed, 960 insertions(+), 139 deletions(-)