Linux 3.1.5-rc1 (Fedora 2.6.41.5-rc1)

Comment out merged patches:
xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch
rtlwifi-fix-lps_lock-deadlock.patch
This commit is contained in:
Chuck Ebbert 2011-12-07 11:49:48 -05:00
parent 1d542ed4c2
commit 16571df650
4 changed files with 14 additions and 5 deletions

View File

@ -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

View File

@ -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

View File

@ -42,7 +42,7 @@ Summary: The Linux kernel
# When changing real_sublevel below, reset this by hand to 1
# (or to 0 and then use rpmdev-bumpspec).
#
%global baserelease 5
%global baserelease 1
%global fedora_build %{baserelease}
# real_sublevel is the 3.x kernel version we're starting with
@ -51,9 +51,9 @@ Summary: The Linux kernel
%define fake_sublevel %(echo $((40 + %{real_sublevel})))
# 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}
@ -1118,7 +1118,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
@ -1276,7 +1276,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
@ -1900,6 +1900,12 @@ fi
# and build.
%changelog
* Wed Dec 07 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.41.5-0.rc1.1
- Linux 3.1.5-rc1 (Fedora 2.6.41.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)

View File

@ -1,2 +1,3 @@
8d43453f8159b2332ad410b19d86a931 linux-3.1.tar.bz2
b8b14bdfbf76cfef8e042e7d1a385fca patch-3.1.4.bz2
cb4154af3daf6279680b808b6affc374 patch-3.1.5-rc1.bz2