summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-07-30 13:49:14 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-07-30 13:50:08 -0400
commitd14432814761acabc7b08c581a5401de5f204822 (patch)
tree069cfc68fbbe25b90090f4456ed5a49ba9a65e78 /kernel.spec
parent74a17995ecd302938e44188a32b59abbe4cd0084 (diff)
downloadkernel-d14432814761acabc7b08c581a5401de5f204822.tar.gz
kernel-d14432814761acabc7b08c581a5401de5f204822.tar.xz
kernel-d14432814761acabc7b08c581a5401de5f204822.zip
Linux v3.16-rc7-64-g26bcd8b72563
- Temporarily disable aarch64patches
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec14
1 files changed, 6 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec
index 960e0bc18..917f107e4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -8,7 +8,7 @@ Summary: The Linux kernel
# be 0.
%global released_kernel 0
-%global aarch64patches 1
+%global aarch64patches 0
# Sign modules on x86. Make sure the config files match this setting if more
# architectures are added.
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 7
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -649,9 +649,6 @@ Patch25120: crypto-properly-label-AF_ALG-socket.patch
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
-#CVE-2014-5077 rhbz 1122982 1123696
-Patch25124: net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch
-
# END OF PATCH DEFINITIONS
%endif
@@ -1387,9 +1384,6 @@ ApplyPatch kernel-arm64.patch -R
%endif
%endif
-#CVE-2014-5077 rhbz 1122982 1123696
-ApplyPatch net-v2-net-sctp-inherit-auth_capable-on-INIT-collisions.patch
-
# END OF PATCH APPLICATIONS
%endif
@@ -2265,6 +2259,10 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Jul 30 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.0-0.rc7.git2.1
+- Linux v3.16-rc7-64-g26bcd8b72563
+- Temporarily disable aarch64patches
+
* Wed Jul 30 2014 Josh Boyer <jwboyer@fedoraproject.org>
- Apply different patch from Milan Broz to fix LUKS partitions (rhbz 1115120)