Linux v4.0-rc2-255-g5f237425f352
This commit is contained in:
parent
3168389a4e
commit
382c3e3884
@ -33,10 +33,10 @@ index 82fbdbc1e0b0..a811210ad486 100644
|
||||
290/040 ALL edd_mbr_sig_buffer EDD MBR signatures
|
||||
2D0/A00 ALL e820_map E820 memory map table
|
||||
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
|
||||
index c2fb8a87dccb..0ec6272203e4 100644
|
||||
index b7d31ca55187..ab403a636357 100644
|
||||
--- a/arch/x86/Kconfig
|
||||
+++ b/arch/x86/Kconfig
|
||||
@@ -1694,6 +1694,16 @@ config EFI_MIXED
|
||||
@@ -1695,6 +1695,16 @@ config EFI_MIXED
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
|
@ -28,7 +28,7 @@ index bfcb1a62a7b4..a1d62e9ed29b 100644
|
||||
virtio_mmio.device=
|
||||
[VMMIO] Memory mapped virtio (platform) device.
|
||||
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
|
||||
index debd30917010..eeb4cf627553 100644
|
||||
index 26eb70c8f518..db70d550f526 100644
|
||||
--- a/drivers/acpi/video.c
|
||||
+++ b/drivers/acpi/video.c
|
||||
@@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot");
|
||||
|
@ -11,10 +11,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
|
||||
index 0ec6272203e4..9d8c58783e7d 100644
|
||||
index ab403a636357..5dac78119fa7 100644
|
||||
--- a/arch/x86/Kconfig
|
||||
+++ b/arch/x86/Kconfig
|
||||
@@ -1695,7 +1695,8 @@ config EFI_MIXED
|
||||
@@ -1696,7 +1696,8 @@ config EFI_MIXED
|
||||
If unsure, say N.
|
||||
|
||||
config EFI_SECURE_BOOT_SIG_ENFORCE
|
||||
|
@ -6433,7 +6433,7 @@ index c5f7b4e..d55c712 100644
|
||||
+static u8 smbios_header[32];
|
||||
+static int smbios_header_size;
|
||||
static phys_addr_t dmi_base;
|
||||
static u16 dmi_len;
|
||||
static u32 dmi_len;
|
||||
static u16 dmi_num;
|
||||
@@ -474,6 +476,8 @@ static int __init dmi_present(const u8 *buf)
|
||||
if (memcmp(buf, "_SM_", 4) == 0 &&
|
||||
|
@ -70,7 +70,7 @@ Summary: The Linux kernel
|
||||
# The rc snapshot level
|
||||
%define rcrev 2
|
||||
# The git snapshot level
|
||||
%define gitrev 1
|
||||
%define gitrev 2
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 4.%{upstream_sublevel}.0
|
||||
%endif
|
||||
@ -2210,6 +2210,9 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Fri Mar 06 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc2.git2.1
|
||||
- Linux v4.0-rc2-255-g5f237425f352
|
||||
|
||||
* Thu Mar 05 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc2.git1.1
|
||||
- Linux v4.0-rc2-150-g6587457b4b3d
|
||||
- Reenable debugging options.
|
||||
|
Loading…
Reference in New Issue
Block a user