SPECS (LINUX_2_6): kernel.spec - kernel-timers.patch now in vserve...

[zbyniu]

Author: zbyniu                       Date: Tue Oct  2 12:06:51 2007 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- kernel-timers.patch now in vserver patch

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1790 -> 1.441.2.1791) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1790 SPECS/kernel.spec:1.441.2.1791
--- SPECS/kernel.spec:1.441.2.1790	Mon Oct  1 14:45:33 2007
+++ SPECS/kernel.spec	Tue Oct  2 14:06:45 2007
@@ -254,9 +254,6 @@
 # netfilter-layer7-v2.13.tar.gz from http://l7-filter.sf.net/
 Patch40:	kernel-layer7.patch
 
-# http://people.linux-vserver.org/~dhozac/p/k/delta-timers-fix01.diff
-Patch41:	kernel-timers.patch
-
 ### End netfilter
 
 # based on 2.6.17 patch from http://www.linuximq.net/patchs/linux-2.6.17-imq1.diff,
@@ -305,7 +302,7 @@
 # http://www.citi.umich.edu/projects/nfsv4/linux/kernel-patches/2.6.22-rc5-1/linux-2.6.22-rc5-CITI_NFS4_ALL-1.diff
 Patch91:	linux-2.6.22-rc5-CITI_NFS4_ALL-1.diff
 
-# based on http://vserver.13thfloor.at/Experimental/patch-2.6.22.1-vs2.3.0.15.diff
+# based on http://vserver.13thfloor.at/Experimental/patch-2.6.22.9-vs2.3.0.26.diff
 Patch100:	linux-2.6-vs2.3.patch
 Patch101:	linux-2.6-vs2.1-suspend2.patch
 # based on http://vserver.13thfloor.at/Experimental/patch-2.6.22.2-vs2.2.0.3.diff
@@ -893,8 +890,6 @@
 %ifarch %{ix86} %{x8664} ia64
 %patch101 -p1
 %endif
-# kernel-timers.patch
-%patch41 -p1
 %endif
 
 #%if %{with xen0} || %{with xenU}
@@ -1661,6 +1656,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1791  2007/10/02 12:06:45  zbyniu
+- kernel-timers.patch now in vserver patch
+
 Revision 1.441.2.1790  2007/10/01 12:45:33  arekm
 - rel 0.5; fix vservers oops triggered by ntpd run on host
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1790&r2=1.441.2.1791&f=u