From 9fe653d31334c2a26550a26dbce02a8c237ce03d Mon Sep 17 00:00:00 2001 From: Andy Bavier Date: Wed, 26 Mar 2008 15:00:41 +0000 Subject: [PATCH] Update vserver patch, import a couple other patches from trunk --- kernel-2.6.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel-2.6.spec b/kernel-2.6.spec index 3ac8f1abd..6910015e2 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -23,7 +23,7 @@ Summary: The Linux kernel (the core of the Linux operating system) %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel}%{?patchlevel:.%{patchlevel}} -%define vsversion 2.3.0.29 +%define vsversion 2.3.0.32 # Will go away when VServer supports NetNS in mainline. Currently, it must be # updated every time the PL kernel is updated. @@ -138,6 +138,8 @@ Patch100: linux-2.6-100-build-nonintconfig.patch # Linux-VServer Patch200: patch-%{rpmversion}-vs%{vsversion}.diff +Patch210: linux-2.6-210-vserver-cpu-sched.patch +Patch220: linux-2.6-220-lback-feat02.diff # IP sets Patch250: linux-2.6-250-ipsets.patch @@ -317,6 +319,8 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 100 %ApplyPatch 200 +%ApplyPatch 210 +%ApplyPatch 220 %ApplyPatch 250 -- 2.43.0