summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2011-12-02 11:36:33 -0500
committerDave Jones <davej@redhat.com>2011-12-02 11:36:33 -0500
commit8c98cf4ff61597136b585b3374771b31d7670f7e (patch)
tree8ae3f9a6694351e39527fed7ab6603f20d8a6e9b /kernel.spec
parentb66345bb323f0b9eda5aa0e9fde559e5686f0fad (diff)
downloadkernel-8c98cf4ff61597136b585b3374771b31d7670f7e.tar.gz
kernel-8c98cf4ff61597136b585b3374771b31d7670f7e.tar.xz
kernel-8c98cf4ff61597136b585b3374771b31d7670f7e.zip
Linux 3.2-rc4-git1 (5983fe2b29df5885880d7fa3b91aca306c7564ef)
dropped: rtlwifi-fix-lps_lock-deadlock.patch (applied upstream)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec12
1 files changed, 5 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec
index 5c54b458d..e5287dd6d 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@redhat.com>
+- Linux 3.2-rc4-git1 (5983fe2b29df5885880d7fa3b91aca306c7564ef)
+ dropped: rtlwifi-fix-lps_lock-deadlock.patch (applied upstream)
+
* Fri Dec 02 2011 Josh Boyer <jwboyer@redhat.com>
- Adjust Requires for modules-extra pacakge to rely on kernel-uname-r