%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.
# 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
Patch550: linux-2.6-550-raise-default-nfile-ulimit.patch
Patch560: linux-2.6-560-mmconf.patch
Patch570: linux-2.6-570-tagxid.patch
-Patch590: linux-2.6-590-trellis-mm1-netns.patch
-Patch591: linux-2.6-591-unshare-netns.patch
-Patch592: linux-2.6-592-ztun-sb.patch
-Patch593: linux-2.6-593-egre.patch
-Patch594: linux-2.6-594-new_ns_pid.patch
-Patch595: linux-2.6-595-vserver-setspace.patch
+Patch580: linux-2.6-580-show-proc-virt.patch
+Patch590: linux-2.6-590-chopstix-intern.patch
+
+# VINI
+Patch700: linux-2.6-700-trellis-mm1-netns.patch
+Patch720: linux-2.6-720-ztun-sb.patch
+Patch730: linux-2.6-730-egre.patch
+Patch740: linux-2.6-740-new_ns_pid.patch
+Patch750: linux-2.6-750-vserver-setspace.patch
+Patch760: linux-2.6-760-unshare-netns-fix.patch
+
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
%description
%ApplyPatch 100
%ApplyPatch 200
+%ApplyPatch 210
+%ApplyPatch 220
%ApplyPatch 250
%ApplyPatch 550
%ApplyPatch 560
%ApplyPatch 570
+%ApplyPatch 580
+%ApplyPatch 590
#
%if 0%{?_with_netns}
-%ApplyPatch 590
-%ApplyPatch 591
-%ApplyPatch 592
-%ApplyPatch 593
-%ApplyPatch 594
-%ApplyPatch 595
+%ApplyPatch 700
+%ApplyPatch 720
+%ApplyPatch 730
+%ApplyPatch 740
+%ApplyPatch 750
+%ApplyPatch 760
%endif
# NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may