packages: kernel/kernel-pom-ng-ROUTE.patch, kernel/kernel-vserver-fixes.pat...

[arekm]

Author: arekm                        Date: Sun May 23 12:59:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update

---- Files affected:
packages/kernel:
   kernel-pom-ng-ROUTE.patch (1.5 -> 1.6) , kernel-vserver-fixes.patch (1.13 -> 1.14) , kernel.spec (1.787 -> 1.788) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-pom-ng-ROUTE.patch
diff -u packages/kernel/kernel-pom-ng-ROUTE.patch:1.5 packages/kernel/kernel-pom-ng-ROUTE.patch:1.6
--- packages/kernel/kernel-pom-ng-ROUTE.patch:1.5	Fri Sep 11 08:53:52 2009
+++ packages/kernel/kernel-pom-ng-ROUTE.patch	Sun May 23 14:59:48 2010
@@ -786,7 +786,7 @@
 +			skb->dev = skb_dst(skb)->dev;
 +
 +			icmpv6_send(skb, ICMPV6_TIME_EXCEED, 
-+				    ICMPV6_EXC_HOPLIMIT, 0, skb->dev);
++				    ICMPV6_EXC_HOPLIMIT, 0);
 +
 +			return NF_DROP;
 +		}

================================================================
Index: packages/kernel/kernel-vserver-fixes.patch
diff -u packages/kernel/kernel-vserver-fixes.patch:1.13 packages/kernel/kernel-vserver-fixes.patch:1.14
--- packages/kernel/kernel-vserver-fixes.patch:1.13	Sat Mar  6 21:17:49 2010
+++ packages/kernel/kernel-vserver-fixes.patch	Sun May 23 14:59:48 2010
@@ -36,3 +36,13 @@
  		(int)strcspn(init_utsname()->version, " "),
  		init_utsname()->version);
 
+--- linux-2.6.34/drivers/block/vroot.c~	2010-05-23 11:03:28.700872640 +0200
++++ linux-2.6.34/drivers/block/vroot.c	2010-05-23 11:28:37.980638214 +0200
+@@ -17,6 +17,7 @@
+ #include <linux/file.h>
+ #include <linux/major.h>
+ #include <linux/blkdev.h>
++#include <linux/slab.h>
+ 
+ #include <linux/vroot.h>
+ #include <linux/vs_context.h>

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.787 packages/kernel/kernel.spec:1.788
--- packages/kernel/kernel.spec:1.787	Sun May 23 11:01:46 2010
+++ packages/kernel/kernel.spec	Sun May 23 14:59:48 2010
@@ -746,7 +746,8 @@
 %patch40 -p1
 
 # ipvs-nfct
-%patch41 -p1
+# FIXME: zone support missing
+#%patch41 -p1
 
 ##
 # end of netfilter
@@ -1521,7 +1522,6 @@
 %defattr(644,root,root,755)
 %{_kernelsrcdir}/arch/*/[!Mik]*
 %{_kernelsrcdir}/arch/*/kernel/[!M]*
-%{_kernelsrcdir}/arch/ia64/ia32/[!M]*
 %{_kernelsrcdir}/arch/ia64/install.sh
 %{_kernelsrcdir}/arch/m68k/ifpsp060/[!M]*
 %{_kernelsrcdir}/arch/m68k/ifpsp060/MISC
@@ -1593,6 +1593,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.788  2010/05/23 12:59:48  arekm
+- update
+
 Revision 1.787  2010/05/23 09:01:46  arekm
 - updated link (no version for .34 yet)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-pom-ng-ROUTE.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-fixes.patch?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.787&r2=1.788&f=u