[Xen-changelog] [xen-unstable] Revert 18242:f20fb83dac2c (Xen 3.3 after all)

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1218096293 -3600
# Node ID 979b193239c729207af119d27a9d27c066ca8686
# Parent  eff5fcfa69bc601f1872a808d7a2134c460f2135
Revert 18242:f20fb83dac2c (Xen 3.3 after all)
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 README       |   20 ++++++++++----------
 xen/Makefile |    4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff -r eff5fcfa69bc -r 979b193239c7 README
--- a/README    Wed Aug 06 15:19:13 2008 +0100
+++ b/README    Thu Aug 07 09:04:53 2008 +0100
@@ -1,10 +1,10 @@
 #################################
- __  __            _  _    ___  
- \ \/ /___ _ __   | || |  / _ \ 
-  \  // _ \ '_ \  | || |_| | | |
-  /  \  __/ | | | |__   _| |_| |
- /_/\_\___|_| |_|    |_|(_)___/ 
-                                
+ __  __            _____  _____  
+ \ \/ /___ _ __   |___ / |___ /  
+  \  // _ \ '_ \    |_ \   |_ \  
+  /  \  __/ | | |  ___) | ___) | 
+ /_/\_\___|_| |_| |____(_)____/  
+                                 
 #################################
 
 http://www.xen.org/
@@ -21,7 +21,7 @@ by the original Xen development team to 
 by the original Xen development team to build enterprise products
 around Xen.
 
-The 4.0 release offers excellent performance, hardware support and
+The 3.3 release offers excellent performance, hardware support and
 enterprise-grade features such as x86_32-PAE, x86_64, SMP guests and
 live relocation of VMs. Ports to Linux 2.6, Linux 2.4, NetBSD, FreeBSD
 and Solaris are available from the community.
@@ -54,8 +54,8 @@ 2. Configure your bootloader to boot Xen
    /boot/grub/menu.lst: edit this file to include an entry like the
    following:
 
-    title Xen 4.0 / XenLinux 2.6
-       kernel /boot/xen-4.0.gz console=vga
+    title Xen 3.3 / XenLinux 2.6
+       kernel /boot/xen-3.3.gz console=vga
        module /boot/vmlinuz-2.6-xen root=<root-dev> ro console=tty0
        module /boot/initrd-2.6-xen.img
 
@@ -74,7 +74,7 @@ 2. Configure your bootloader to boot Xen
    32MB memory for internal use, which is not available for allocation
    to virtual machines.
 
-3. Reboot your system and select the "Xen 4.0 / XenLinux 2.6" menu
+3. Reboot your system and select the "Xen 3.3 / XenLinux 2.6" menu
    option. After booting Xen, Linux will start and your initialisation
    scripts should execute in the usual way.
 
diff -r eff5fcfa69bc -r 979b193239c7 xen/Makefile
--- a/xen/Makefile      Wed Aug 06 15:19:13 2008 +0100
+++ b/xen/Makefile      Thu Aug 07 09:04:53 2008 +0100
@@ -1,7 +1,7 @@
 # This is the correct place to edit the build version.
 # All other places this is stored (eg. compile.h) should be autogenerated.
-export XEN_VERSION       = 4
-export XEN_SUBVERSION    = 0
+export XEN_VERSION       = 3
+export XEN_SUBVERSION    = 3
 export XEN_EXTRAVERSION ?= .0-rc3-pre$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog