From: Andy Bavier Date: Fri, 7 Mar 2008 20:22:34 +0000 (+0000) Subject: Add Patch 595 X-Git-Tag: trellis-2.6.22-Jan-2009~45 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=ea4d21e49603f66c1c1adafaf0383a11a39cb378;p=linux-2.6.git Add Patch 595 --- diff --git a/kernel-2.6-planetlab.spec b/kernel-2.6-planetlab.spec index f32e640ef..9f26d7a8a 100644 --- a/kernel-2.6-planetlab.spec +++ b/kernel-2.6-planetlab.spec @@ -156,7 +156,7 @@ 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-new-netns.patch BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root %description @@ -336,6 +336,7 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 592 %ApplyPatch 593 %ApplyPatch 594 +%ApplyPatch 595 %endif # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may