diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-30 10:42:39 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-30 10:42:39 -0800 |
commit | b8dbf73086085f1973d3ae66f709e78c077fed05 (patch) | |
tree | b6bfe33415352b93e01778b5cc5c41c271656e28 /include/linux/lockdep.h | |
parent | Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | x86/efi: Clarify that reset attack mitigation needs appropriate userspace (diff) | |
download | linux-dev-b8dbf73086085f1973d3ae66f709e78c077fed05.tar.xz linux-dev-b8dbf73086085f1973d3ae66f709e78c077fed05.zip |
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 'include/linux/lockdep.h')
0 files changed, 0 insertions, 0 deletions