summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2011-10-21 20:01:25 -0400
committerChuck Ebbert <cebbert@redhat.com>2011-10-21 20:01:25 -0400
commit65b0d9b17d6f4e29af727394aad61b52699bbe54 (patch)
treef4e425be90524e761af9e1d0d31d9a065d442a02 /kernel.spec
parent62a1a480d47f16f561772934434d4444350b2671 (diff)
downloadkernel-65b0d9b17d6f4e29af727394aad61b52699bbe54.tar.gz
kernel-65b0d9b17d6f4e29af727394aad61b52699bbe54.tar.xz
kernel-65b0d9b17d6f4e29af727394aad61b52699bbe54.zip
Update to upstream HEAD (v3.1-rc10-42-g2efd7c0).
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 3 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec
index 44d71c1e0..093f9315a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -84,7 +84,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 10
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -749,9 +749,6 @@ Patch21002: mmc-Always-check-for-lower-base-frequency-quirk-for-.patch
Patch21020: 0001-mm-vmscan-Limit-direct-reclaim-for-higher-order-allo.patch
Patch21021: 0002-mm-Abort-reclaim-compaction-if-compaction-can-procee.patch
-# rhbz #746485
-Patch21030: cputimer-cure-lock-inversion.patch
-
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1379,9 +1376,6 @@ ApplyPatch utrace.patch
ApplyPatch 0001-mm-vmscan-Limit-direct-reclaim-for-higher-order-allo.patch
ApplyPatch 0002-mm-Abort-reclaim-compaction-if-compaction-can-procee.patch
-# rhbz #746485
-ApplyPatch cputimer-cure-lock-inversion.patch
-
# END OF PATCH APPLICATIONS
%endif
@@ -2090,8 +2084,9 @@ fi
# ||----w |
# || ||
%changelog
-* Fri Oct 21 2011 Chuck Ebbert <cebbert@redhat.com>
+* Fri Oct 21 2011 Chuck Ebbert <cebbert@redhat.com> 3.1.0-0.rc10.git1.1
- Require grubby >= 8.3-1 like F16 does.
+- Update to upstream HEAD (v3.1-rc10-42-g2efd7c0).
* Fri Oct 21 2011 Dave Jones <davej@redhat.com>
- Lower severity of Radeon lockup messages.