Turning trellis back to trunk to check in the latest differnce.

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

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index dccdd6e..66544b0 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -40,7 +40,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 # updated every time the PL kernel is updated.
 %define vini_pl_patch 561
 
-%define release trellis.vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 %{!?pldistro:%global pldistro planetlab}
 
@@ -169,9 +169,7 @@ Patch650: linux-2.6-650-hangcheck-reboot.patch
 Patch660: linux-2.6-660-nmi-watchdog-default.patch
 Patch680: linux-2.6-680-htb-hysteresis-tso.patch
 Patch690: linux-2.6-690-web100.patch
-Patch700: linux-2.6-690-web100.patch
-Patch710: linux-2.6-710-disable-vserver-check-for-ns-devices.patch
-Patch720: linux-2.6-720-egre.patch
+Patch700: linux-2.6-700-egre.patch
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
 
@@ -359,9 +357,7 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 640
 %ApplyPatch 650
 %ApplyPatch 660
-
-%ApplyPatch 710
-%ApplyPatch 720
+%ApplyPatch 700
 
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may