summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-03-06 15:18:56 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-03-06 15:18:56 -0500
commit382c3e3884086adcb8fffb1a9ffaf41e8486c10f (patch)
tree9207f0a257dab78ae0a8957c58960dfaf5064fab
parent3168389a4ef6ff74076753fadfe6530dd4dc61c8 (diff)
downloadkernel-382c3e3884086adcb8fffb1a9ffaf41e8486c10f.tar.gz
kernel-382c3e3884086adcb8fffb1a9ffaf41e8486c10f.tar.xz
kernel-382c3e3884086adcb8fffb1a9ffaf41e8486c10f.zip
Linux v4.0-rc2-255-g5f237425f352
-rw-r--r--Add-option-to-automatically-enforce-module-signature.patch4
-rw-r--r--Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch2
-rw-r--r--efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch4
-rw-r--r--kernel-arm64.patch2
-rw-r--r--kernel.spec5
-rw-r--r--sources2
6 files changed, 11 insertions, 8 deletions
diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch
index 8f9122481..0a589883c 100644
--- a/Add-option-to-automatically-enforce-module-signature.patch
+++ b/Add-option-to-automatically-enforce-module-signature.patch
@@ -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.
diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
index d10088ab7..0c751c0b4 100644
--- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
+++ b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
@@ -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");
diff --git a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
index f4cdd8d35..e6cf81345 100644
--- a/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
+++ b/efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch
@@ -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
diff --git a/kernel-arm64.patch b/kernel-arm64.patch
index b7edb527c..0154945c3 100644
--- a/kernel-arm64.patch
+++ b/kernel-arm64.patch
@@ -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 &&
diff --git a/kernel.spec b/kernel.spec
index ddd7f9522..a8820908a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -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.
diff --git a/sources b/sources
index f0a70eb02..a32dff95c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
a0c7ef1474083d3e589446ad0b924820 linux-4.0-rc2.tar.xz
66129fcf6f8692817bcdac27f5c48708 perf-man-4.0-rc2.tar.gz
-e8ad797f04b5fa4bbfb402cee1395ba2 patch-4.0-rc2-git1.xz
+9240cfcfa46e77fd5fc261da9bef99e3 patch-4.0-rc2-git2.xz