Commit 60970c18 authored Mar 07, 2019 by Linus Torvalds

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 platform update from Ingo Molnar:
 "A defconfig update"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/defconfig: Enable EFI stub, mixed mode and BGRT

parents f86727f8 1c034a2f

arch/x86/configs/i386_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -310,3 +310,5 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM=y
		CONFIG_SECURITY_SELINUX_DISABLE=y
		CONFIG_CRYPTO_AES_586=y
		# CONFIG_CRYPTO_ANSI_CPRNG is not set
		CONFIG_EFI_STUB=y
		CONFIG_ACPI_BGRT=y

arch/x86/configs/x86_64_defconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -308,3 +308,6 @@ CONFIG_SECURITY_SELINUX=y
		CONFIG_SECURITY_SELINUX_BOOTPARAM=y
		CONFIG_SECURITY_SELINUX_DISABLE=y
		# CONFIG_CRYPTO_ANSI_CPRNG is not set
		CONFIG_EFI_STUB=y
		CONFIG_EFI_MIXED=y
		CONFIG_ACPI_BGRT=y