From: Linus Torvalds Date: Sun, 24 Jun 2018 11:48:30 +0000 (+0800) Subject: Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v5.15~8545 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=177d363e720c9a940282a295acbd36c2657cc279;p=mirror_ubuntu-kernels.git Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 pti fixes from Thomas Gleixner: "Two small updates for the speculative distractions: - Make it more clear to the compiler that array_index_mask_nospec() is not subject for optimizations. It's not perfect, but ... - Don't report XEN PV guests as vulnerable because their mitigation state depends on the hypervisor. Report unknown and refer to the hypervisor requirement" * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/spectre_v1: Disable compiler optimizations over array_index_mask_nospec() x86/pti: Don't report XenPV as vulnerable --- 177d363e720c9a940282a295acbd36c2657cc279