[kernel/f17] Linux 3.3.7

[Justin M. Forbes]

commit af477035458dacba15b78f19e057d26ce867e748
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Mon May 21 17:17:13 2012 -0500

    Linux 3.3.7

 TODO                                               |    1 +
 config-x86-32-generic                              |    3 +
 dl2k-Clean-up-rio_ioctl.patch                      |  120 --------------------
 dvbs-fix-zigzag.patch                              |   15 ---
 kernel.spec                                        |   23 +---
 ...void-beyond-bounds-copy-while-caching-ACL.patch |   85 --------------
 ...d-reading-past-buffer-when-calling-GETACL.patch |  120 --------------------
 sources                                            |    2 +-
 8 files changed, 11 insertions(+), 358 deletions(-)
---
diff --git a/TODO b/TODO
index 652000e..8728760 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,6 @@
 Config TODOs:
 * review & disable a bunch of the I2C, RTC, DVB, SOUND options.
+* Re-enable CONFIG_RELOCATABLE for 32bit builds with 3.4
 
 
 Spec file TODOs:
diff --git a/config-x86-32-generic b/config-x86-32-generic
index 3fd696c..3a6a689 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -88,6 +88,9 @@ CONFIG_X86_LONGRUN=y
 CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
 
+# Turn back on in 3.4
+# CONFIG_RELOCATABLE is not set
+
 
 # CONFIG_4KSTACKS is not set
 
diff --git a/kernel.spec b/kernel.spec
index 9f2d1f3..fd1a987 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 5
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -66,7 +66,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 6
+%define stable_update 7
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -698,7 +698,6 @@ Patch2802: linux-2.6-silence-acpi-blacklist.patch
 # media patches
 Patch2900: add-poll-requested-events.patch
 Patch2901: drivers-media-update.patch
-Patch2902: dvbs-fix-zigzag.patch
 
 # fs fixes
 Patch4000: ext4-fix-resize-when-resizing-within-single-group.patch
@@ -717,10 +716,6 @@ Patch4113: NFS-optimise-away-unnecessary-setattrs-for-open-O_TRUNC.patch
 Patch4114: NFSv4-fix-open-O_TRUNC-and-ftruncate-error-handling.patch
 Patch4115: NFSv4-Rate-limit-the-state-manager-for-lock-reclaim-.patch
 
-#rhbz 822874
-Patch4116: nfs-Avoid-reading-past-buffer-when-calling-GETACL.patch
-Patch4117: nfs-Avoid-beyond-bounds-copy-while-caching-ACL.patch
-
 # patches headed upstream
 Patch10000: fs-proc-devtree-remove_proc_entry.patch
 
@@ -803,9 +798,6 @@ Patch22013: ipw2x00-add-supported-cipher-suites-to-wiphy-initialization.patch
 
 Patch22014: efifb-skip-DMI-checks-if-bootloader-knows.patch
 
-#rhbz 818820
-Patch22016: dl2k-Clean-up-rio_ioctl.patch
-
 #rhbz 726143
 Patch22017: 0001-drm-radeon-don-t-mess-with-hot-plug-detect-for-eDP-o.patch
 
@@ -1402,9 +1394,6 @@ ApplyPatch NFS-optimise-away-unnecessary-setattrs-for-open-O_TRUNC.patch
 ApplyPatch NFSv4-fix-open-O_TRUNC-and-ftruncate-error-handling.patch
 ApplyPatch NFSv4-Rate-limit-the-state-manager-for-lock-reclaim-.patch
 
-ApplyPatch nfs-Avoid-reading-past-buffer-when-calling-GETACL.patch
-ApplyPatch nfs-Avoid-beyond-bounds-copy-while-caching-ACL.patch
-
 # USB
 
 # WMI
@@ -1491,7 +1480,6 @@ ApplyPatch quite-apm.patch
 # Media (V4L/DVB/IR) updates/fixes/experimental drivers
 #  apply if non-empty
 ApplyPatch add-poll-requested-events.patch
-ApplyPatch dvbs-fix-zigzag.patch
 ApplyOptionalPatch drivers-media-update.patch
 
 # Patches headed upstream
@@ -1567,9 +1555,6 @@ ApplyPatch ipw2x00-add-supported-cipher-suites-to-wiphy-initialization.patch
 
 ApplyPatch efifb-skip-DMI-checks-if-bootloader-knows.patch
 
-#rhbz 818820
-ApplyPatch dl2k-Clean-up-rio_ioctl.patch
-
 #rhbz 726143
 ApplyPatch 0001-drm-radeon-don-t-mess-with-hot-plug-detect-for-eDP-o.patch
 
@@ -2436,6 +2421,10 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Mon May 21 2012 Justin M. Forbes <jforbes at redhat.com> 3.3.7-1
+- Linux 3.3.7
+- Disable CONFIG_RELOCATABLE for 32bit builds. Turn back on for 3.4
+
 * Fri May 18 2012 Josh Boyer <jwboyer at redhat.com>
 - Additional fixes for CVE-2011-4131 (rhbz 822874 822869)
 
diff --git a/sources b/sources
index 755d90d..03cb562 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 7133f5a2086a7d7ef97abac610c094f5  linux-3.3.tar.xz
-a7f67e9c491403906e4bb475de194631  patch-3.3.6.xz
+622a3b43238559aeb778279969631260  patch-3.3.7.xz