(no commit message)

[linux-2.6.git] / kernel-2.6.spec

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 2944871..3731055 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -33,7 +33,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 
 %define release vs%{vsversion}.%{specrelease}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
-%{!?pldistro:%global pldistro planetlab}
+%{!?pldistro:%global pldistro trellis}
 
 %define signmodules 0
 %define make_target bzImage
@@ -158,11 +158,11 @@ Patch590: linux-2.6-590-chopstix-intern.patch
 
 # VINI
 Patch700: linux-2.6-700-trellis-mm1-netns.patch
-Patch710: linux-2.6-710-unshare-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
 
@@ -343,11 +343,11 @@ KERNEL_PREVIOUS=vanilla
 # 
 %if 0%{?_with_netns}
 %ApplyPatch 700
-%ApplyPatch 710
 %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