summaryrefslogtreecommitdiff
path: root/security/keys/user_defined.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-03-01 21:32:30 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-03-01 21:32:30 +0300
commit6053dc981449718d90a429933e99b441e1adaea6 (patch)
tree2f1f9e7e3b0b7dcaad282f9651b29f52f9433fc3 /security/keys/user_defined.c
parentb286cedd473006b33d5ae076afac509e6b2c3bf4 (diff)
parent638f863dbbc8da16834ee0acc6ac10754f79c486 (diff)
downloadlinux-6053dc981449718d90a429933e99b441e1adaea6.tar.xz
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Will Deacon: "The main fix here addresses a kernel panic triggered on Qualcomm QDF2400 due to incorrect register usage in an erratum workaround introduced during the merge window. Summary: - Fix kernel panic on specific Qualcomm platform due to broken erratum workaround - Revert contiguous bit support due to TLB conflict aborts in simulation - Don't treat all CPU ID register fields as 4-bit quantities" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64/cpufeature: check correct field width when updating sys_val Revert "arm64: mm: set the contiguous bit for kernel mappings where appropriate" arm64: Avoid clobbering mm in erratum workaround on QDF2400
Diffstat (limited to 'security/keys/user_defined.c')
0 files changed, 0 insertions, 0 deletions