summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-03-24 15:20:33 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-03-24 15:20:33 -0400
commit6a44257de77a5136f6717b7f313a77b3ca73b310 (patch)
tree32a366304a608e8304350861c20df15bbbea8c11 /kernel.spec
parentea3aaf7b014b4bd0237dd42603f56c30730f6a0d (diff)
downloadkernel-6a44257de77a5136f6717b7f313a77b3ca73b310.tar.gz
kernel-6a44257de77a5136f6717b7f313a77b3ca73b310.tar.xz
kernel-6a44257de77a5136f6717b7f313a77b3ca73b310.zip
Linux v4.5-12257-g8b97be054572
- staging, timers, perf, irq, x86, sched, locking merges
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec
index 4703cb7d4..c06e6a6c4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 23
+%define gitrev 24
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -614,9 +614,6 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
Patch667: intel_pstate-Do-not-call-wrmsrl_on_cpu-with-disabled.patch
-#rhbz 1318596
-Patch668: x86-tsc-Prevent-NULL-pointer-deref-in-calibrate_dela.patch
-
#CVE-2016-3137 rhbz 1317010 1316996
Patch672: cypress_m8-add-sanity-checking.patch
@@ -2165,6 +2162,10 @@ fi
#
#
%changelog
+* Thu Mar 24 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git24.1
+- Linux v4.5-12257-g8b97be054572
+- staging, timers, perf, irq, x86, sched, locking merges
+
* Thu Mar 24 2016 jwboyer@gmail.com - 4.6.0-0.rc0.git23.1
- Linux v4.5-12149-gaca04ce
- net, pwm, target, platform-drivers merges