From e2f558b75cd3b774f126bad317bcda97fc4d5490 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 30 Mar 2015 09:07:13 -0400 Subject: [PATCH] Linux v4.0-rc6 --- ...ption-to-automatically-enforce-module-signature.patch | 2 +- Add-secure_modules-call.patch | 2 +- Add-sysrq-option-to-disable-secure-boot-mode.patch | 2 +- Kbuild-Add-an-option-to-enable-GCC-VTA.patch | 2 +- kernel.spec | 9 ++++++--- sources | 5 ++--- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Add-option-to-automatically-enforce-module-signature.patch b/Add-option-to-automatically-enforce-module-signature.patch index 2e81ecf37..5759d8c4e 100644 --- a/Add-option-to-automatically-enforce-module-signature.patch +++ b/Add-option-to-automatically-enforce-module-signature.patch @@ -163,7 +163,7 @@ index b033dab5c8bf..f526b6e02f59 100644 extern int modules_disabled; /* for sysctl */ diff --git a/kernel/module.c b/kernel/module.c -index e6ff2181b2a5..95931292f3c4 100644 +index 33e695877504..f1742ffe92bd 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3892,6 +3892,13 @@ void module_layout(struct module *mod, diff --git a/Add-secure_modules-call.patch b/Add-secure_modules-call.patch index 86f542fe5..8086e46b1 100644 --- a/Add-secure_modules-call.patch +++ b/Add-secure_modules-call.patch @@ -41,7 +41,7 @@ index b03485bcb82a..b033dab5c8bf 100644 #ifdef CONFIG_SYSFS diff --git a/kernel/module.c b/kernel/module.c -index b3d634ed06c9..e6ff2181b2a5 100644 +index 99fdf94efce8..33e695877504 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3891,3 +3891,13 @@ void module_layout(struct module *mod, diff --git a/Add-sysrq-option-to-disable-secure-boot-mode.patch b/Add-sysrq-option-to-disable-secure-boot-mode.patch index e37c83f25..1c4ed18e7 100644 --- a/Add-sysrq-option-to-disable-secure-boot-mode.patch +++ b/Add-sysrq-option-to-disable-secure-boot-mode.patch @@ -228,7 +228,7 @@ index 4121345498e0..0ff3cef5df96 100644 return 0; diff --git a/kernel/module.c b/kernel/module.c -index 95931292f3c4..974381763108 100644 +index f1742ffe92bd..f4738b4cc373 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -107,9 +107,9 @@ struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */ diff --git a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch index 222ad9187..e9a9a00a7 100644 --- a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch +++ b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch @@ -43,7 +43,7 @@ Signed-off-by: Josh Stone 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 14c722f96877..1858317a9074 100644 +index da36a3be7969..92089c03e64e 100644 --- a/Makefile +++ b/Makefile @@ -706,7 +706,11 @@ KBUILD_CFLAGS += -fomit-frame-pointer diff --git a/kernel.spec b/kernel.spec index 7c79dee02..225496b94 100644 --- a/kernel.spec +++ b/kernel.spec @@ -66,9 +66,9 @@ Summary: The Linux kernel # define upstream_sublevel %(echo $((%{base_sublevel} + 1))) %define upstream_sublevel 0 # The rc snapshot level -%define rcrev 5 +%define rcrev 6 # The git snapshot level -%define gitrev 4 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -406,7 +406,7 @@ BuildRequires: binutils-%{_build_arch}-linux-gnu, gcc-%{_build_arch}-linux-gnu %endif #Source0: ftp://ftp.kernel.org/pub/linux/kernel/v4.x/linux-%{kversion}.tar.xz -Source0: ftp://ftp.kernel.org/pub/linux/kernel/v4.x/linux-4.0-rc5.tar.xz +Source0: ftp://ftp.kernel.org/pub/linux/kernel/v4.x/linux-4.0-rc6.tar.xz Source10: perf-man-%{kversion}.tar.gz Source11: x509.genkey @@ -2223,6 +2223,9 @@ fi # # %changelog +* Mon Mar 30 2015 Josh Boyer - 4.0.0-0.rc6.git0.1 +- Linux v4.0-rc6 + * Fri Mar 27 2015 Josh Boyer - 4.0.0-0.rc5.git4.1 - Linux v4.0-rc5-96-g3c435c1e472b - Fixes hangs due to i915 issues (rhbz 1204050 1206056) diff --git a/sources b/sources index f0c7106ac..70ef6f29a 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -b26150c980099ef554b26d07f470e647 linux-4.0-rc5.tar.xz -7614f559a09f0242827fc7783c7adf3f perf-man-4.0-rc5.tar.gz -6b92fe5b8052c71e65a6db8d43a776fa patch-4.0-rc5-git4.xz +bec0aeeacab2852d9a17ccbfa7e280f8 linux-4.0-rc6.tar.xz +260f7a6cccde97c91b2e79eb93049820 perf-man-4.0-rc6.tar.gz