diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-20 09:32:40 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-20 09:32:40 -0800 |
commit | 0389075ecfb6231818de9b0225d3a5a21a661171 (patch) | |
tree | 991154188efee4117974d9aa5bcd7497257c7656 /Makefile | |
parent | 06b74c658c595e4ef9fd5746f927a1cb6c3a59d5 (diff) | |
parent | f4eafd8bcd5229e998aa252627703b8462c3b90f (diff) | |
download | linux-stable-0389075ecfb6231818de9b0225d3a5a21a661171.tar.gz linux-stable-0389075ecfb6231818de9b0225d3a5a21a661171.tar.bz2 linux-stable-0389075ecfb6231818de9b0225d3a5a21a661171.zip |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"This is unusually large, partly due to the EFI fixes that prevent
accidental deletion of EFI variables through efivarfs that may brick
machines. These fixes are somewhat involved to maintain compatibility
with existing install methods and other usage modes, while trying to
turn off the 'rm -rf' bricking vector.
Other fixes are for large page ioremap()s and for non-temporal
user-memcpy()s"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mm: Fix vmalloc_fault() to handle large pages properly
hpet: Drop stale URLs
x86/uaccess/64: Handle the caching of 4-byte nocache copies properly in __copy_user_nocache()
x86/uaccess/64: Make the __copy_user_nocache() assembly code more readable
lib/ucs2_string: Correct ucs2 -> utf8 conversion
efi: Add pstore variables to the deletion whitelist
efi: Make efivarfs entries immutable by default
efi: Make our variable validation list include the guid
efi: Do variable name validation tests in utf8
efi: Use ucs2_as_utf8 in efivarfs instead of open coding a bad version
lib/ucs2_string: Add ucs2 -> utf8 helper functions
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions