projects / sdk / emulator / emulator-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 646c4b7 9115c75)
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming...
authorIngo Molnar <mingo@kernel.org>
Fri, 31 Jul 2015 07:55:26 +0000 (09:55 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 31 Jul 2015 07:55:26 +0000 (09:55 +0200)
commit1adb9123f96a2553b5b373aff1eb6ae939d31d5c
treea1a60202f48fb8cd62b78bad423b8088e8438105tree | snapshot
parent646c4b75494747887f936513b669bb8a2d794459commit | diff
parent9115c7589b11349a1c3099758b4bded579ff69e0commit | diff
Merge tag 'efi-urgent' of git://git./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>
Domain: SDK / Emulator;