* Matt Fleming <matt@xxxxxxxxxxxxxxxxx> wrote: > Hi guys, > > The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37: > > Linux 3.7-rc1 (2012-10-14 14:41:04 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git tags/efi-for-3.7 > > for you to fetch changes up to 5189c2a7c7769ee9d037d76c1a7b8550ccf3481c: > > x86: efi: Turn off efi_enabled after setup on mixed fw/kernel (2012-10-25 19:09:40 +0100) > > ---------------------------------------------------------------- > EFI updates for 3.7 > > Fix oops with EFI variables on mixed 32/64-bit firmware/kernels and > document EFI git repository location on kernel.org. > > ---------------------------------------------------------------- > Matt Fleming (1): > MAINTAINERS: Add EFI git repository location > > Olof Johansson (1): > x86: efi: Turn off efi_enabled after setup on mixed fw/kernel > > MAINTAINERS | 1 + > arch/x86/include/asm/efi.h | 1 + > arch/x86/kernel/setup.c | 12 ++++++++++++ > arch/x86/platform/efi/efi.c | 18 ++++++++++-------- > 4 files changed, 24 insertions(+), 8 deletions(-) So, this conflicted with this pending EFI fix in tip:x86/urgent: 3e8fa263a970 x86/efi: Fix oops caused by incorrect set_memory_uc() usage I've pulled it and fixed up the conflict - please double check the end result. Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
