diff options
author | Linus Torvalds | 2018-04-13 20:24:18 +0200 |
---|---|---|
committer | Linus Torvalds | 2018-04-13 20:24:18 +0200 |
commit | e4e57f20fa12ce044fa2b9fec204098799485539 (patch) | |
tree | 4271c5e7fb20dfee874c81d35e8b47cd3125a36e /arch/sh | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff) | |
parent | arm64: assembler: add macros to conditionally yield the NEON under PREEMPT (diff) | |
download | kernel-qcow2-linux-e4e57f20fa12ce044fa2b9fec204098799485539.tar.gz kernel-qcow2-linux-e4e57f20fa12ce044fa2b9fec204098799485539.tar.xz kernel-qcow2-linux-e4e57f20fa12ce044fa2b9fec204098799485539.zip |
Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull more arm64 updates from Will Deacon:
"A few late updates to address some issues arising from conflicts with
other trees:
- Removal of Qualcomm-specific Spectre-v2 mitigation in favour of the
generic SMCCC-based firmware call
- Fix EL2 hardening capability checking, which was bodged to reduce
conflicts with the KVM tree
- Add some currently unused assembler macros for managing SIMD
registers which will be used by some crypto code in the next merge
window"
* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: assembler: add macros to conditionally yield the NEON under PREEMPT
arm64: assembler: add utility macros to push/pop stack frames
arm64: Move the content of bpi.S to hyp-entry.S
arm64: Get rid of __smccc_workaround_1_hvc_*
arm64: capabilities: Rework EL2 vector hardening entry
arm64: KVM: Use SMCCC_ARCH_WORKAROUND_1 for Falkor BP hardening
Diffstat (limited to 'arch/sh')
0 files changed, 0 insertions, 0 deletions