[kernel] Linux 3.2-rc4-git1 (5983fe2b29df5885880d7fa3b91aca306c7564ef) dropped: rtlwifi-fix-lps_lock-deadlock
Dave Jones
davej at fedoraproject.org
Fri Dec 2 16:36:45 UTC 2011
commit 8c98cf4ff61597136b585b3374771b31d7670f7e
Author: Dave Jones <davej at redhat.com>
Date: Fri Dec 2 11:36:33 2011 -0500
Linux 3.2-rc4-git1 (5983fe2b29df5885880d7fa3b91aca306c7564ef)
dropped: rtlwifi-fix-lps_lock-deadlock.patch (applied upstream)
kernel.spec | 12 +-
rtlwifi-fix-lps_lock-deadlock.patch | 224 -----------------------------------
sources | 1 +
3 files changed, 6 insertions(+), 231 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 5c54b45..e5287dd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 4
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -714,9 +714,6 @@ Patch21091: pci-Rework-ASPM-disable-code.patch
#rhbz 753236
Patch21029: nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch
-#rhbz 755154
-Patch21200: rtlwifi-fix-lps_lock-deadlock.patch
-
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1375,9 +1372,6 @@ ApplyPatch pci-Rework-ASPM-disable-code.patch
#rhbz 753236
ApplyPatch nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch
-#rhbz 755154
-ApplyPatch rtlwifi-fix-lps_lock-deadlock.patch
-
# END OF PATCH APPLICATIONS
%endif
@@ -2171,6 +2165,10 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Dec 02 2011 Dave Jones <davej at redhat.com>
+- Linux 3.2-rc4-git1 (5983fe2b29df5885880d7fa3b91aca306c7564ef)
+ dropped: rtlwifi-fix-lps_lock-deadlock.patch (applied upstream)
+
* Fri Dec 02 2011 Josh Boyer <jwboyer at redhat.com>
- Adjust Requires for modules-extra pacakge to rely on kernel-uname-r
diff --git a/sources b/sources
index c9e3fac..f34f53d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
8d43453f8159b2332ad410b19d86a931 linux-3.1.tar.bz2
77da243ea639c14679d67788b2b72f41 compat-wireless-2011-11-15.tar.bz2
0f8c09d8ad9dda10166196cf1b5679bb patch-3.2-rc4.xz
+357fd305e97c4a37b1d7d2e593d0c256 patch-3.2-rc4-git1.xz
More information about the scm-commits
mailing list