From 8ed136869acaf7af99a9d29eaf580f3f073d73dd Mon Sep 17 00:00:00 2001
From: Chuck Ebbert <cebbert@redhat.com>
Date: Wed, 7 Dec 2011 11:38:39 -0500
Subject: [PATCH] Linux 3.1.5-rc1

Comment out merged patches:
xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch
rtlwifi-fix-lps_lock-deadlock.patch
---
 config-arm-omap-generic |  1 +
 config-arm-tegra        |  1 +
 kernel.spec             | 16 +++++++++++-----
 sources                 |  1 +
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index 8c3ae6a24..b4163bc5a 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -121,6 +121,7 @@ CONFIG_ARM_ERRATA_430973=y
 # CONFIG_ARM_ERRATA_742230 is not set
 # CONFIG_ARM_ERRATA_742231 is not set
 CONFIG_PL310_ERRATA_588369=y
+CONFIG_PL310_ERRATA_769419=y
 CONFIG_ARM_ERRATA_720789=y
 # CONFIG_ARM_ERRATA_743622 is not set
 # CONFIG_ARM_ERRATA_751472 is not set
diff --git a/config-arm-tegra b/config-arm-tegra
index 910b39f81..b131978d2 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -34,6 +34,7 @@ CONFIG_ARM_ERRATA_430973=y
 CONFIG_ARM_ERRATA_742230=y
 # CONFIG_ARM_ERRATA_742231 is not set
 CONFIG_PL310_ERRATA_588369=y
+CONFIG_PL310_ERRATA_769419=y
 CONFIG_ARM_ERRATA_720789=y
 # CONFIG_PL310_ERRATA_727915 is not set
 # CONFIG_ARM_ERRATA_743622 is not set
diff --git a/kernel.spec b/kernel.spec
index 8eff462ba..523bb424a 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,9 +66,9 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 4
+%define stable_update 5
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -1301,7 +1301,7 @@ ApplyPatch linux-2.6-i386-nx-emulation.patch
 ApplyPatch jbd-jbd2-validate-sb-s_first-in-journal_get_superblo.patch
 
 # xfs
-ApplyPatch xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch
+#ApplyPatch xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch
 
 # btrfs
 
@@ -1460,7 +1460,7 @@ ApplyPatch cciss-fix-irqf-shared.patch
 ApplyPatch hpsa-add-irqf-shared.patch
 
 #rhbz 755154
-ApplyPatch rtlwifi-fix-lps_lock-deadlock.patch
+#ApplyPatch rtlwifi-fix-lps_lock-deadlock.patch
 
 #rhbz 731365
 ApplyPatch mac80211_offchannel_rework_revert.patch
@@ -2198,6 +2198,12 @@ fi
 # and build.
 
 %changelog
+* Wed Dec 07 2011 Chuck Ebbert <cebbert@redhat.com> 3.1.5-0.rc1.1
+- Linux 3.1.5-rc1
+- Comment out merged patches:
+  xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch
+  rtlwifi-fix-lps_lock-deadlock.patch
+
 * Tue Dec 06 2011 Chuck Ebbert <cebbert@redhat.com>
 - Disable uas until someone can fix it (rhbz #717633)
 
diff --git a/sources b/sources
index b8c0593a0..2a313cf69 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 8d43453f8159b2332ad410b19d86a931  linux-3.1.tar.bz2
 6693d8c42055f83f5701d9b65d47208a  compat-wireless-3.2-rc1-1.tar.bz2
 b8b14bdfbf76cfef8e042e7d1a385fca  patch-3.1.4.bz2
+cb4154af3daf6279680b808b6affc374  patch-3.1.5-rc1.bz2