summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-04-24 14:12:03 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-04-24 14:12:03 -0400
commit6a7da49029ca51dc71a86f954d56b2c919ce9e64 (patch)
tree992785f5573be89289efa090a14c27f3de23a305
parent015762cdf4bb3cb54c8ae869714209f2e9652100 (diff)
downloadkernel-6a7da49029ca51dc71a86f954d56b2c919ce9e64.tar.gz
kernel-6a7da49029ca51dc71a86f954d56b2c919ce9e64.tar.xz
kernel-6a7da49029ca51dc71a86f954d56b2c919ce9e64.zip
Linux v4.0-10976-gd56a669ca59c
-rw-r--r--Add-option-to-automatically-enforce-module-signature.patch4
-rw-r--r--Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch4
-rw-r--r--acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch2
-rw-r--r--arm64-avoid-needing-console-to-enable-serial-console.patch4
-rw-r--r--efi-Make-EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch4
-rw-r--r--kernel.spec5
-rw-r--r--sources2
7 files changed, 14 insertions, 11 deletions
diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch
index bfb12e0a7..84d9cdf91 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 6049d587599e..cfd53b6b95f6 100644
+index 226d5696e1d1..6a8f880e213f 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -1696,6 +1696,16 @@ config EFI_MIXED
+@@ -1697,6 +1697,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 33285a3ae..901fac7d5 100644
--- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
+++ b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
@@ -15,10 +15,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 84960c66c77b..f5920f27596b 100644
+index f6befa9855c1..50dbe26124f0 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -3862,7 +3862,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -3863,7 +3863,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
the allocated input device; If set to 0, video driver
will only send out the event without touching backlight
brightness level.
diff --git a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
index 7afe23d42..f6ee351b2 100644
--- a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
+++ b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch
@@ -13,7 +13,7 @@ Signed-off-by: Josh Boyer <jwboyer@redhat.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
-index f9eeae871593..aa1dcf3d0216 100644
+index 39748bb3a543..72edfeedb326 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -44,6 +44,7 @@
diff --git a/arm64-avoid-needing-console-to-enable-serial-console.patch b/arm64-avoid-needing-console-to-enable-serial-console.patch
index b40baa30e..4e6f873c1 100644
--- a/arm64-avoid-needing-console-to-enable-serial-console.patch
+++ b/arm64-avoid-needing-console-to-enable-serial-console.patch
@@ -14,10 +14,10 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
1 file changed, 19 insertions(+)
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
-index 51ef97274b52..784731f5c45e 100644
+index 74753132c3ac..3cc99d7c2361 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
-@@ -568,3 +568,22 @@ const struct seq_operations cpuinfo_op = {
+@@ -579,3 +579,22 @@ const struct seq_operations cpuinfo_op = {
.stop = c_stop,
.show = c_show
};
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 40e8b8d1f..aa3a40e48 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 cfd53b6b95f6..3cd149818005 100644
+index 6a8f880e213f..d3c21e9d267c 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -1697,7 +1697,8 @@ config EFI_MIXED
+@@ -1698,7 +1698,8 @@ config EFI_MIXED
If unsure, say N.
config EFI_SECURE_BOOT_SIG_ENFORCE
diff --git a/kernel.spec b/kernel.spec
index 0e638ea94..8e1a5fd83 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 13
+%define gitrev 14
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -2193,6 +2193,9 @@ fi
#
#
%changelog
+* Fri Apr 24 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git14.1
+- Linux v4.0-10976-gd56a669ca59c
+
* Fri Apr 24 2015 Josh Boyer <jwboyer@fedoraproject.org>
- Fix iscsi with QNAP devices (rhbz 1208999)
diff --git a/sources b/sources
index 9d0e58890..367e7859c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
a86916bd12798220da9eb4a1eec3616d linux-4.0.tar.xz
d125eecce68ab6fb5f1f23523c2c04b8 perf-man-4.0.tar.gz
-059384b90e76b8c6691069e31ebbc401 patch-4.0-git13.xz
+e466ea29d2753c0175a8a03f719f608b patch-4.0-git14.xz