From: Andy Bavier <acb@cs.princeton.edu>
Date: Fri, 4 Apr 2008 18:37:13 +0000 (+0000)
Subject: Renamed files to avoid patch number collisions with trunk
X-Git-Tag: trellis-2.6.22-Jan-2009~12
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f009cac05701ace04ae7f816e6734f6a63a2bd2d;p=linux-2.6.git

Renamed files to avoid patch number collisions with trunk
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 6910015e2..294487162 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -153,12 +153,17 @@ Patch540: linux-2.6-540-oom-kill.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
+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
+
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
 
 %description
@@ -332,15 +337,17 @@ KERNEL_PREVIOUS=vanilla
 %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 710
+%ApplyPatch 720
+%ApplyPatch 730
+%ApplyPatch 740
+%ApplyPatch 750
 %endif
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
diff --git a/linux-2.6-590-trellis-mm1-netns.patch b/linux-2.6-700-trellis-mm1-netns.patch
similarity index 100%
rename from linux-2.6-590-trellis-mm1-netns.patch
rename to linux-2.6-700-trellis-mm1-netns.patch
diff --git a/linux-2.6-591-unshare-netns.patch b/linux-2.6-710-unshare-netns.patch
similarity index 100%
rename from linux-2.6-591-unshare-netns.patch
rename to linux-2.6-710-unshare-netns.patch
diff --git a/linux-2.6-592-ztun-sb.patch b/linux-2.6-720-ztun-sb.patch
similarity index 100%
rename from linux-2.6-592-ztun-sb.patch
rename to linux-2.6-720-ztun-sb.patch
diff --git a/linux-2.6-593-egre.patch b/linux-2.6-730-egre.patch
similarity index 100%
rename from linux-2.6-593-egre.patch
rename to linux-2.6-730-egre.patch
diff --git a/linux-2.6-594-new_ns_pid.patch b/linux-2.6-740-new_ns_pid.patch
similarity index 100%
rename from linux-2.6-594-new_ns_pid.patch
rename to linux-2.6-740-new_ns_pid.patch
diff --git a/linux-2.6-595-vserver-setspace.patch b/linux-2.6-750-vserver-setspace.patch
similarity index 100%
rename from linux-2.6-595-vserver-setspace.patch
rename to linux-2.6-750-vserver-setspace.patch