[LV-k25-commit] CVS: kernel-2.5 Makefile,1.26,1.27 README.cvs-tags,1.3,1.4

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv20538

Modified Files:
	Makefile README.cvs-tags 
Log Message:
Won't be doing a kh20030124 release - post-2_5_21-import was broken, so
I'll fix and re-tag that instead


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile	24 Jan 2003 00:34:48 -0000	1.26
+++ Makefile	24 Jan 2003 00:46:48 -0000	1.27
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 5
 SUBLEVEL = 21
-EXTRAVERSION = -kh20030124
+EXTRAVERSION =
 
 # We are using a recursive build, so we need to do a little thinking
 # to get the ordering right.

Index: README.cvs-tags
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/README.cvs-tags,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README.cvs-tags	24 Jan 2003 00:34:48 -0000	1.3
+++ README.cvs-tags	24 Jan 2003 00:46:48 -0000	1.4
@@ -32,14 +32,6 @@
                            processor registers.  Boots to user mode on a KA42
                            with NFS root and no SCSI (NCR5380 driver is broken).
 
-      kh-20030124          Merged up as far as official 2.5.21 kernel.
-                           Changes to compiler options.  We're now using exact 
-                           same compiler options as official kernel, except we 
-                           use -O1 rather than -O2.  (Something in vaxlance.c
-                           or networking breaks with -O2 - BOOTP packets 
-                           appear on the write too short.)  Boots to user mode
-                           on a KA46, with NFS root.
-
 Branch:  linux-2_5         Vendor branch for official Linus kernels
 
    This branch is a "vendor" branch in CVS terminology.  We use it to hold