diff options
| -rw-r--r-- | KEYS-Add-a-system-blacklist-keyring.patch | 4 | ||||
| -rw-r--r-- | MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch | 4 | ||||
| -rw-r--r-- | criu-no-expert.patch | 6 | ||||
| -rw-r--r-- | kernel.spec | 11 | ||||
| -rw-r--r-- | sources | 6 |
5 files changed, 16 insertions, 15 deletions
diff --git a/KEYS-Add-a-system-blacklist-keyring.patch b/KEYS-Add-a-system-blacklist-keyring.patch index ca6eb84eb..17ef25bf1 100644 --- a/KEYS-Add-a-system-blacklist-keyring.patch +++ b/KEYS-Add-a-system-blacklist-keyring.patch @@ -29,10 +29,10 @@ index 72665eb80692..2c7b80d31366 100644 + #endif /* _KEYS_SYSTEM_KEYRING_H */ diff --git a/init/Kconfig b/init/Kconfig -index e84c6423a2e5..223b1a32bbcb 100644 +index 80a6907f91c5..dfdd7f738247 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1720,6 +1720,15 @@ config SYSTEM_TRUSTED_KEYRING +@@ -1723,6 +1723,15 @@ config SYSTEM_TRUSTED_KEYRING Keys in this keyring are used by module signature checking. diff --git a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch index 8aa848c1e..a23a15cd3 100644 --- a/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch +++ b/MODSIGN-Import-certificates-from-UEFI-Secure-Boot.patch @@ -42,10 +42,10 @@ index 41359e548bcb..db9e6118575e 100644 efi_guid_t guid; u64 table; diff --git a/init/Kconfig b/init/Kconfig -index 223b1a32bbcb..3bad458f1c68 100644 +index dfdd7f738247..3c866db603a7 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1874,6 +1874,15 @@ config MODULE_SIG_ALL +@@ -1877,6 +1877,15 @@ config MODULE_SIG_ALL comment "Do not forget to sign required modules with scripts/sign-file" depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL diff --git a/criu-no-expert.patch b/criu-no-expert.patch index c2d424e59..2ac9eb04c 100644 --- a/criu-no-expert.patch +++ b/criu-no-expert.patch @@ -9,10 +9,10 @@ Upstream-status: Fedora mustard 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init/Kconfig b/init/Kconfig -index 3bad458f1c68..aee58b9fedfc 100644 +index 3c866db603a7..bfb3c54d5286 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1147,7 +1147,7 @@ config DEBUG_BLK_CGROUP +@@ -1149,7 +1149,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -21,7 +21,7 @@ index 3bad458f1c68..aee58b9fedfc 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. -@@ -1158,7 +1158,7 @@ config CHECKPOINT_RESTORE +@@ -1160,7 +1160,7 @@ config CHECKPOINT_RESTORE If unsure, say N here. menuconfig NAMESPACES diff --git a/kernel.spec b/kernel.spec index 19848f4d5..53d1827c1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -6,7 +6,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%global released_kernel 0 +%global released_kernel 1 %global aarch64patches 1 @@ -48,7 +48,7 @@ Summary: The Linux kernel # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base, # which yields a base_sublevel of 0. -%define base_sublevel 16 +%define base_sublevel 17 ## If this is a released kernel ## %if 0%{?released_kernel} @@ -67,9 +67,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%define rcrev 7 +%define rcrev 0 # The git snapshot level -%define gitrev 3 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -2230,6 +2230,9 @@ fi # ||----w | # || || %changelog +* Mon Oct 06 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-1 +- Linux v3.17 + * Fri Oct 03 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc7.git3.1 - Linux v3.17-rc7-76-g58586869599f - Various ppc64/ppc64le config changes @@ -1,4 +1,2 @@ -5c569ed649a0c9711879f333e90c5386 linux-3.16.tar.xz -49868ce6467b35cd9ffea1120d129462 perf-man-3.16.tar.gz -225ad95c519089a2f9acc503f948c11a patch-3.17-rc7.xz -c5a3bf45884d8b585f48c6ac772d8d1f patch-3.17-rc7-git3.xz +fb30d0f29214d75cddd2faa94f73d5cf linux-3.17.tar.xz +159e969cbc27201d8e2fa0f609dc722f perf-man-3.17.tar.gz |