Change version string.

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 8175e01..dccdd6e 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 vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release trellis.vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 %{!?pldistro:%global pldistro planetlab}
 
@@ -169,6 +169,9 @@ 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
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
 
@@ -357,6 +360,9 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 650
 %ApplyPatch 660
 
+%ApplyPatch 710
+%ApplyPatch 720
+
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
 # break with later patches.