change the ordering for now, I'll alter vserver patch later

[linux-2.6.git] / kernel-2.6.spec

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 2dfd13c..c99eadc 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -28,7 +28,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 # for module-tag.py - sublevel is used for the version (middle) part of tag names
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 21
+%define taglevel 22
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -149,8 +149,6 @@ Source30: %{kernelconfig}-%{kversion}-i686-xenU.config
 Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2
 %endif
 
-Patch001: 52.patch
-
 Patch010: linux-2.6-010-e1000e-ich10lan.patch
 Patch017: linux-2.6-017-bnx2.patch
 
@@ -162,6 +160,8 @@ Patch220: delta-ptrace-fix01.diff
 Patch230: delta-pivot-fix01.diff
 Patch240: delta-killperm-fix01.diff
 
+Patch241: 52.patch
+
 # IP sets
 Patch250: linux-2.6-250-ipsets.patch
 
@@ -357,8 +357,6 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 0
 %endif
 
-%ApplyPatch 1
-
 %ApplyPatch 10
 %ApplyPatch 17
 
@@ -370,6 +368,8 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 230
 %ApplyPatch 240
 
+%ApplyPatch 241
+
 %ApplyPatch 250
 
 %ApplyPatch 500
@@ -834,6 +834,9 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
+* Sun Aug 15 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-27-22
+- Test 52-rc2
+
 * Fri Aug 13 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-27-21
 - Bump to 2.6.27.51 and include 2.6.27.51-rc1 patchset to test