Merge tag 'v4.17.15' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.17-stable

Author: Ralf Baechle <[email protected]> Fri Aug 31 02:11:52 2018 +0200
Commit: 64815d817fe9fab766186350f4f234d841a2821c
Gitweb: https://git.linux-mips.org/g/ralf/linux/64815d817fe9
Branch: linux-4.17-stable

---

 Documentation/ABI/testing/sysfs-devices-system-cpu |   24 +
 Documentation/admin-guide/index.rst                |    9 
 Documentation/admin-guide/kernel-parameters.txt    |   78 +++
 Documentation/admin-guide/l1tf.rst                 |  610 ++++++++++++++++++++
 Makefile                                           |    2 
 arch/Kconfig                                       |    3 
 arch/arm/boot/dts/imx6sx.dtsi                      |    2 
 arch/parisc/Kconfig                                |    2 
 arch/parisc/include/asm/barrier.h                  |   32 +
 arch/parisc/kernel/entry.S                         |    2 
 arch/parisc/kernel/pacache.S                       |    1 
 arch/parisc/kernel/syscall.S                       |    4 
 arch/x86/Kconfig                                   |    1 
 arch/x86/include/asm/apic.h                        |    9 
 arch/x86/include/asm/cpufeatures.h                 |    3 
 arch/x86/include/asm/dmi.h                         |    2 
 arch/x86/include/asm/hardirq.h                     |   26 +
 arch/x86/include/asm/irqflags.h                    |    2 
 arch/x86/include/asm/kvm_host.h                    |    6 
 arch/x86/include/asm/msr-index.h                   |    7 
 arch/x86/include/asm/page_32_types.h               |    9 
 arch/x86/include/asm/pgtable-2level.h              |   17 +
 arch/x86/include/asm/pgtable-3level.h              |   37 +
 arch/x86/include/asm/pgtable-invert.h              |   32 +
 arch/x86/include/asm/pgtable.h                     |   74 ++
 arch/x86/include/asm/pgtable_64.h                  |   38 +
 arch/x86/include/asm/processor.h                   |   17 +
 arch/x86/include/asm/smp.h                         |    1 
 arch/x86/include/asm/topology.h                    |    6 
 arch/x86/include/asm/vmx.h                         |   11 
 arch/x86/kernel/apic/apic.c                        |   18 +
 arch/x86/kernel/apic/io_apic.c                     |    1 
 arch/x86/kernel/apic/msi.c                         |    1 
 arch/x86/kernel/apic/vector.c                      |    1 
 arch/x86/kernel/cpu/amd.c                          |   59 +-
 arch/x86/kernel/cpu/bugs.c                         |  171 +++++-
 arch/x86/kernel/cpu/common.c                       |   63 +-
 arch/x86/kernel/cpu/cpu.h                          |    2 
 arch/x86/kernel/cpu/intel.c                        |    7 
 arch/x86/kernel/cpu/microcode/core.c               |   16 -
 arch/x86/kernel/cpu/topology.c                     |   41 +
 arch/x86/kernel/fpu/core.c                         |    1 
 arch/x86/kernel/hpet.c                             |    1 
 arch/x86/kernel/i8259.c                            |    1 
 arch/x86/kernel/idt.c                              |    1 
 arch/x86/kernel/irq.c                              |    1 
 arch/x86/kernel/irq_32.c                           |    1 
 arch/x86/kernel/irq_64.c                           |    1 
 arch/x86/kernel/irqinit.c                          |    1 
 arch/x86/kernel/kprobes/core.c                     |    5 
 arch/x86/kernel/paravirt.c                         |   14 
 arch/x86/kernel/setup.c                            |    6 
 arch/x86/kernel/smp.c                              |    1 
 arch/x86/kernel/smpboot.c                          |   25 +
 arch/x86/kernel/time.c                             |    1 
 arch/x86/kvm/mmu.c                                 |    1 
 arch/x86/kvm/vmx.c                                 |  455 ++++++++++++---
 arch/x86/kvm/x86.c                                 |   34 +
 arch/x86/mm/init.c                                 |   25 +
 arch/x86/mm/kmmio.c                                |   25 -
 arch/x86/mm/mmap.c                                 |   21 +
 arch/x86/mm/pageattr.c                             |    8 
 arch/x86/mm/pti.c                                  |    1 
 .../intel-mid/device_libs/platform_mrfld_wdt.c     |    1 
 arch/x86/platform/uv/tlb_uv.c                      |    1 
 arch/x86/xen/enlighten.c                           |    1 
 drivers/base/cpu.c                                 |    8 
 drivers/block/zram/zram_drv.c                      |   15 
 drivers/gpu/drm/i915/i915_pmu.c                    |    1 
 drivers/gpu/drm/i915/intel_lpe_audio.c             |    1 
 drivers/net/xen-netfront.c                         |    8 
 drivers/pci/host/pci-hyperv.c                      |    2 
 drivers/scsi/qla2xxx/qla_iocb.c                    |   53 +-
 drivers/scsi/sr.c                                  |   29 +
 fs/dcache.c                                        |   13 
 fs/namespace.c                                     |   28 +
 include/asm-generic/pgtable.h                      |   12 
 include/linux/cpu.h                                |   23 +
 include/linux/swapfile.h                           |    2 
 init/main.c                                        |    2 
 kernel/bpf/sockmap.c                               |    9 
 kernel/cpu.c                                       |  284 +++++++++
 kernel/sched/core.c                                |   30 -
 kernel/sched/deadline.c                            |    8 
 kernel/sched/fair.c                                |    1 
 kernel/smp.c                                       |    2 
 kernel/softirq.c                                   |   12 
 kernel/stop_machine.c                              |   10 
 mm/memory.c                                        |   37 +
 mm/mprotect.c                                      |   49 ++
 mm/swapfile.c                                      |   46 +-
 tools/arch/x86/include/asm/cpufeatures.h           |   23 +
 tools/include/uapi/linux/prctl.h                   |   12 
 93 files changed, 2419 insertions(+), 381 deletions(-)