packages (Titanium): kernel-bare-vserver/linux-2.6-grsec-vs-minimal.patch -...

[hawk]

Author: hawk                         Date: Thu Feb 25 18:39:00 2010 GMT
Module: packages                      Tag: Titanium
---- Log message:
- fix diff merge error

---- Files affected:
packages/kernel-bare-vserver:
   linux-2.6-grsec-vs-minimal.patch (1.1.2.8.2.14 -> 1.1.2.8.2.15) 

---- Diffs:

================================================================
Index: packages/kernel-bare-vserver/linux-2.6-grsec-vs-minimal.patch
diff -u packages/kernel-bare-vserver/linux-2.6-grsec-vs-minimal.patch:1.1.2.8.2.14 packages/kernel-bare-vserver/linux-2.6-grsec-vs-minimal.patch:1.1.2.8.2.15
--- packages/kernel-bare-vserver/linux-2.6-grsec-vs-minimal.patch:1.1.2.8.2.14	Thu Feb 25 19:25:50 2010
+++ packages/kernel-bare-vserver/linux-2.6-grsec-vs-minimal.patch	Thu Feb 25 19:38:55 2010
@@ -1228,6 +1228,9 @@
  
  static void print_slabinfo_header(struct seq_file *m)
  {
+diff -urNp linux-2.6.32.9/mm/slub.c linux-2.6.32.9/mm/slub.c
+--- linux-2.6.32.9/mm/slub.c	2010-02-09 07:57:19.000000000 -0500
++++ linux-2.6.32.9/mm/slub.c	2010-02-23 17:09:56.713257424 -0500
 @@ -4696,7 +4737,7 @@ __initcall(slab_sysfs_init);
  /*
   * The /proc/slabinfo ABI
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-bare-vserver/linux-2.6-grsec-vs-minimal.patch?r1=1.1.2.8.2.14&r2=1.1.2.8.2.15&f=u