main/linux-vserver: upgrade to 2.6.32.8-vs2.3.0.36.29

(cherry picked from commit bd45d8581fb9b2b4d3de4bb38351707b3d30dc9d)

2 files changed, 21 insertions, 11 deletions

diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index 083bddd11d..d1b2dec34c 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=vserver
 pkgname=linux-${_flavor}
-pkgver=2.6.32.6
+pkgver=2.6.32.8
 _kernver=2.6.32
 pkgrel=0
 pkgdesc="Linux kernel with vserver"
@@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
 install=
 source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
         ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
-        http://vserver.13thfloor.at/Experimental/patch-2.6.32.6-vs2.3.0.36.28.diff
+        http://vserver.13thfloor.at/Experimental/patch-2.6.32.8-vs2.3.0.36.29.diff
         kernelconfig.x86
         "
 subpackages="$pkgname-dev"
@@ -114,6 +114,6 @@ dev() {
 }
 
 md5sums="260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2
-94415211e7854fc9377e948379c86679  patch-2.6.32.6.bz2
-99bbcdadc77b61d385d88f6cc37d7c7a  patch-2.6.32.6-vs2.3.0.36.28.diff
-86d5988d01198848fdad6f663fdbb39d  kernelconfig.x86"
+eabf01da4c72f7ea5b4e4bf8e8535e5f  patch-2.6.32.8.bz2
+b8f52684ad1b97456c59241259ac43bd  patch-2.6.32.8-vs2.3.0.36.29.diff
+42ce36a36e7c71ee54761e56d59d17ed  kernelconfig.x86"
diff --git a/main/linux-vserver/kernelconfig.x86 b/main/linux-vserver/kernelconfig.x86
index 2fb20c4098..6fe9ef4d46 100644
--- a/main/linux-vserver/kernelconfig.x86
+++ b/main/linux-vserver/kernelconfig.x86
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32-vs2.3.0.36.27
-# Thu Dec 17 07:38:56 2009
+# Linux kernel version: 2.6.32.8-vs2.3.0.36.29
+# Mon Feb 15 09:49:17 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -98,7 +98,18 @@ CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_USER_SCHED=y
 # CONFIG_CGROUP_SCHED is not set
-# CONFIG_CGROUPS is not set
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+# CONFIG_CGROUP_NS is not set
+# CONFIG_CGROUP_FREEZER is not set
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 CONFIG_NAMESPACES=y
@@ -264,8 +275,7 @@ CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
 # CONFIG_PROCESSOR_SELECT is not set
 CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_CYRIX_32=y
@@ -298,7 +308,6 @@ CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
-CONFIG_X86_CPU_DEBUG=m
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
@@ -916,6 +925,7 @@ CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
+# CONFIG_NET_CLS_CGROUP is not set
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m