diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-30 21:42:39 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-30 21:42:39 +0300 |
commit | b8dbf73086085f1973d3ae66f709e78c077fed05 (patch) | |
tree | b6bfe33415352b93e01778b5cc5c41c271656e28 /kernel/locking/lockdep.c | |
parent | d772794637451c424729dd71690d7ac158523108 (diff) | |
parent | a5c03c31af2291f13689d11760c0b59fb70c9a5a (diff) | |
download | linux-b8dbf73086085f1973d3ae66f709e78c077fed05.tar.xz |
Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI updates from Ingo Molnar:
"The biggest change in this cycle was the addition of ARM CPER error
decoding when printing EFI errors into the kernel log.
There are also misc smaller updates: documentation update, cleanups
and an EFI memory map permissions quirk"
* 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/efi: Clarify that reset attack mitigation needs appropriate userspace
efi: Parse ARM error information value
efi: Move ARM CPER code to new file
efi: Use PTR_ERR_OR_ZERO()
arm64/efi: Ignore EFI_MEMORY_XP attribute if RP and/or WP are set
efi/capsule-loader: Fix pr_err() string to end with newline
Diffstat (limited to 'kernel/locking/lockdep.c')
0 files changed, 0 insertions, 0 deletions