summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2013-03-24 22:11:40 -0400
committerDave Jones <davej@redhat.com>2013-03-24 22:11:40 -0400
commit1740c33c63ab9339dbbdc22981c99e1294ac7533 (patch)
tree53a5bca5e613c41f11988a2c37d71fc463a031c1 /kernel.spec
parentcfeb4721e8744f5bb2e8719ab253c5b4471b89b0 (diff)
downloadkernel-1740c33c63ab9339dbbdc22981c99e1294ac7533.tar.gz
kernel-1740c33c63ab9339dbbdc22981c99e1294ac7533.tar.xz
kernel-1740c33c63ab9339dbbdc22981c99e1294ac7533.zip
Linux 3.9-rc4
merged: drm-i915-bounds-check-execbuffer-relocation-count.patch
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec16
1 files changed, 7 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec
index 840d492f3..8fdfebba3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 2
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -93,9 +93,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 3
+%define rcrev 4
# The git snapshot level
-%define gitrev 1
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -734,9 +734,6 @@ Patch21261: 0001-kmsg-Honor-dmesg_restrict-sysctl-on-dev-kmsg.patch
#rhbz 914737
Patch21262: x86-mm-Fix-vmalloc_fault-oops-during-lazy-MMU-updates.patch
-#CVE-2013-0913 rhbz 920471 920529
-Patch21271: drm-i915-bounds-check-execbuffer-relocation-count.patch
-
#rhbz 856863 892599
Patch21273: cfg80211-mac80211-disconnect-on-suspend.patch
Patch21274: mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch
@@ -1441,9 +1438,6 @@ ApplyPatch 0001-kmsg-Honor-dmesg_restrict-sysctl-on-dev-kmsg.patch
#rhbz 914737
ApplyPatch x86-mm-Fix-vmalloc_fault-oops-during-lazy-MMU-updates.patch
-#CVE-2013-0913 rhbz 920471 920529
-ApplyPatch drm-i915-bounds-check-execbuffer-relocation-count.patch
-
#rhbz 856863 892599
ApplyPatch cfg80211-mac80211-disconnect-on-suspend.patch
ApplyPatch mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch
@@ -2295,6 +2289,10 @@ fi
# ||----w |
# || ||
%changelog
+* Sun Mar 24 2013 Dave Jones <davej@redhat.com> -3.9.0-0.rc4.git0.1
+- Linux 3.9-rc4
+ merged: drm-i915-bounds-check-execbuffer-relocation-count.patch
+
* Sun Mar 24 2013 Peter Robinson <pbrobinson@fedoraproject.org>
- Update ARM config for OMAP/mvebu/lpae