diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-08 10:09:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-08 10:09:36 -0800 |
| commit | 40be821d627c61ee5beb51d265af372ab29804e4 (patch) | |
| tree | 06a3212cfd92c4aa0fd5745000183c69a33afb64 /net/caif | |
| parent | 100e38914a025a2fc797aa887efee15d812e9f83 (diff) | |
| parent | 801284f9737883a2b2639bd494455a72c82fdedf (diff) | |
Merge tag 'x86-urgent-2020-11-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"A set of x86 fixes:
- Use SYM_FUNC_START_WEAK in the mem* ASM functions instead of a
combination of .weak and SYM_FUNC_START_LOCAL which makes LLVMs
integrated assembler upset
- Correct the mitigation selection logic which prevented the related
prctl to work correctly
- Make the UV5 hubless system work correctly by fixing up the
malformed table entries and adding the missing ones"
* tag 'x86-urgent-2020-11-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/platform/uv: Recognize UV5 hubless system identifier
x86/platform/uv: Remove spaces from OEM IDs
x86/platform/uv: Fix missing OEM_TABLE_ID
x86/speculation: Allow IBPB to be conditionally enabled on CPUs with always-on STIBP
x86/lib: Change .weak to SYM_FUNC_START_WEAK for arch/x86/lib/mem*_64.S
Diffstat (limited to 'net/caif')
0 files changed, 0 insertions, 0 deletions