summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-11-08 07:39:48 -0500
committerJosh Boyer <jwboyer@redhat.com>2011-11-08 07:39:48 -0500
commite3e38acf4d2f5d18ff720e3580201b55bc36a7ab (patch)
tree83b3b90b6956dc893dc7b042011e8da8de7101c3 /kernel.spec
parent44ef27d0d05713408d7afbf1155d53b24bacc69c (diff)
downloadkernel-e3e38acf4d2f5d18ff720e3580201b55bc36a7ab.tar.gz
kernel-e3e38acf4d2f5d18ff720e3580201b55bc36a7ab.tar.xz
kernel-e3e38acf4d2f5d18ff720e3580201b55bc36a7ab.zip
Linux 3.2-rc1
From kernel.org this time, not git generated locally: http://www.kernel.org/pub/linux/kernel/v3.x/patch-3.2-rc1.bz2
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec21
1 files changed, 6 insertions, 15 deletions
diff --git a/kernel.spec b/kernel.spec
index 2d8e8a972..9b4216c14 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,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 3
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -85,9 +85,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 0
+%define rcrev 1
# The git snapshot level
-%define gitrev 7
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -700,14 +700,8 @@ Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
#rhbz 749166
Patch21050: xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch
-#rhbz 731365
-Patch21062: mac80211-fix-remain_off_channel-regression.patch
-Patch21063: mac80211-config-hw-when-going-back-on-channel.patch
-
Patch21070: oom-fix-integer-overflow-of-points.patch
-Patch21071: modsplit-post-merge.patch
-
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1329,12 +1323,6 @@ ApplyPatch utrace.patch
#rhbz 750402
ApplyPatch oom-fix-integer-overflow-of-points.patch
-ApplyPatch modsplit-post-merge.patch
-
-#rhbz 731365
-ApplyPatch mac80211-fix-remain_off_channel-regression.patch
-ApplyPatch mac80211-config-hw-when-going-back-on-channel.patch
-
# END OF PATCH APPLICATIONS
%endif
@@ -2038,6 +2026,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Nov 08 2011 Josh Boyer <jwboyer@redhat.com>
+- Linux 3.2-rc1
+
* Mon Nov 07 2011 Josh Boyer <jwboyer@redhat.com>
- Linux 3.1-git7
- Drop override for XEN_MAX_DOMAIN_MEMORY (rhbz 751789)