| commit | 1adb9123f96a2553b5b373aff1eb6ae939d31d5c | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Fri Jul 31 09:55:26 2015 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Fri Jul 31 09:55:26 2015 +0200 |
| tree | a1a60202f48fb8cd62b78bad423b8088e8438105 | |
| parent | 646c4b75494747887f936513b669bb8a2d794459 [diff] | |
| parent | 9115c7589b11349a1c3099758b4bded579ff69e0 [diff] |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent Pull EFI fixes from Matt Fleming: * Fix an EFI boot issue preventing a Parallels virtual machine from booting because the upper 32-bits of the EFI memmap pointer were being discarded in setup_e820(). (Dmitry Skorodumov) * Validate that the "efi" kernel parameter gets used with an argument, otherwise we will oops. (Ricardo Neri) Signed-off-by: Ingo Molnar <mingo@kernel.org>