[kernel] Linux 3.2-rc1

[Josh Boyer]

commit e3e38acf4d2f5d18ff720e3580201b55bc36a7ab
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Nov 8 07:39:48 2011 -0500

    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

 config-arm-generic                                 |    1 +
 config-generic                                     |    1 +
 kernel.spec                                        |   21 +--
 ...0211-config-hw-when-going-back-on-channel.patch |   40 -----
 mac80211-fix-remain_off_channel-regression.patch   |   44 ------
 modsplit-post-merge.patch                          |  156 --------------------
 6 files changed, 8 insertions(+), 255 deletions(-)
---
diff --git a/config-arm-generic b/config-arm-generic
index 1406e40..2bd045a 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -60,6 +60,7 @@ CONFIG_LEDS_CPU=y
 CONFIG_MTD_AFS_PARTS=y
 CONFIG_MTD_ARM_INTEGRATOR=y
 CONFIG_MTD_IMPA7=y
+CONFIG_MTD_OF_PARTS=y
 
 CONFIG_AX88796=m
 CONFIG_AX88796_93CX6=y
diff --git a/config-generic b/config-generic
index 683bd1f..a668c78 100644
--- a/config-generic
+++ b/config-generic
@@ -207,6 +207,7 @@ CONFIG_MTD_BLOCK2MTD=m
 CONFIG_MTD_OOPS=m
 # CONFIG_MTD_INTEL_VR_NOR is not set
 CONFIG_MTD_ALAUDA=m
+CONFIG_MTD_DOCG3=m
 
 CONFIG_FTL=m
 CONFIG_NFTL=m
diff --git a/kernel.spec b/kernel.spec
index 2d8e8a9..9b4216c 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 at redhat.com>
+- Linux 3.2-rc1
+
 * Mon Nov 07 2011 Josh Boyer <jwboyer at redhat.com>
 - Linux 3.1-git7
 - Drop override for XEN_MAX_DOMAIN_MEMORY (rhbz 751789)