diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-18 12:03:15 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-18 12:03:15 -0700 |
commit | 9e1909b9da04fb582b20d3805e16fad3f6ebf984 (patch) | |
tree | 3752e397308f50d9d42eb2b409a8b0b9f1336af3 /net/8021q/vlanproc.c | |
parent | df4fe17802a306a17f5a6f4db9cdd2a3b661264d (diff) | |
parent | bb8c13d61a629276a162c1d2b1a20a815cbcfbb7 (diff) | |
download | op-kernel-dev-9e1909b9da04fb582b20d3805e16fad3f6ebf984.zip op-kernel-dev-9e1909b9da04fb582b20d3805e16fad3f6ebf984.tar.gz |
Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/pti updates from Thomas Gleixner:
"Another set of melted spectrum updates:
- Iron out the last late microcode loading issues by actually
checking whether new microcode is present and preventing the CPU
synchronization to run into a timeout induced hang.
- Remove Skylake C2 from the microcode blacklist according to the
latest Intel documentation
- Fix the VM86 POPF emulation which traps if VIP is set, but VIF is
not. Enhance the selftests to catch that kind of issue
- Annotate indirect calls/jumps for objtool on 32bit. This is not a
functional issue, but for consistency sake its the right thing to
do.
- Fix a jump label build warning observed on SPARC64 which uses 32bit
storage for the code location which is casted to 64 bit pointer w/o
extending it to 64bit first.
- Add two new cpufeature bits. Not really an urgent issue, but
provides them for both x86 and x86/kvm work. No impact on the
current kernel"
* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/microcode: Fix CPU synchronization routine
x86/microcode: Attempt late loading only when new microcode is present
x86/speculation: Remove Skylake C2 from Speculation Control microcode blacklist
jump_label: Fix sparc64 warning
x86/speculation, objtool: Annotate indirect calls/jumps for objtool on 32-bit kernels
x86/vm86/32: Fix POPF emulation
selftests/x86/entry_from_vm86: Add test cases for POPF
selftests/x86/entry_from_vm86: Exit with 1 if we fail
x86/cpufeatures: Add Intel PCONFIG cpufeature
x86/cpufeatures: Add Intel Total Memory Encryption cpufeature
Diffstat (limited to 'net/8021q/vlanproc.c')
0 files changed, 0 insertions, 0 deletions