2002-01-22 15:19:25

by Dave Jones

[permalink] [raw]
Subject: cris patches in 2.5.3-pre3.

Some of the cris patches in pre3 seem to be going backwards.
Is this intentional? Or just CVS weirdness ?

diff -u --recursive --new-file v2.5.2/linux/arch/cris/Makefile linux/arch/cris/M
--- v2.5.2/linux/arch/cris/Makefile Mon Oct 8 11:43:54 2001
+++ linux/arch/cris/Makefile Mon Jan 21 16:00:39 2002
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 2001/10/01 14:42:38 bjornw Exp $
+# $Id: Makefile,v 1.3 2002/01/21 15:21:23 bjornw Exp $
# cris/Makefile
#


diff -u --recursive --new-file v2.5.2/linux/arch/cris/boot/rescue/head.S linux/a
--- v2.5.2/linux/arch/cris/boot/rescue/head.S Mon Oct 8 11:43:54 2001
+++ linux/arch/cris/boot/rescue/head.S Mon Jan 21 16:00:39 2002
@@ -1,4 +1,4 @@
-/* $Id: head.S,v 1.8 2001/10/03 17:15:15 bjornw Exp $
+/* $Id: head.S,v 1.2 2001/12/18 13:35:12 bjornw Exp $
*
*

--
Dave Jones. http://www.codemonkey.org.uk
SuSE Labs.


2002-01-22 15:26:56

by Jeff Garzik

[permalink] [raw]
Subject: Re: cris patches in 2.5.3-pre3.

Dave Jones wrote:
> Some of the cris patches in pre3 seem to be going backwards.
> Is this intentional? Or just CVS weirdness ?

> -# $Id: Makefile,v 1.22 2001/10/01 14:42:38 bjornw Exp $
> +# $Id: Makefile,v 1.3 2002/01/21 15:21:23 bjornw Exp $

from 2001 -> 2002

> -/* $Id: head.S,v 1.8 2001/10/03 17:15:15 bjornw Exp $
> +/* $Id: head.S,v 1.2 2001/12/18 13:35:12 bjornw Exp $

from october -> december

looks ok to me, do I need more caffeine? :)

Jeff


--
Jeff Garzik | "I went through my candy like hot oatmeal
Building 1024 | through an internally-buttered weasel."
MandrakeSoft | - goats.com

2002-01-22 15:32:36

by Dave Jones

[permalink] [raw]
Subject: Re: cris patches in 2.5.3-pre3.

On Tue, 22 Jan 2002, Jeff Garzik wrote:

> > -# $Id: Makefile,v 1.22 2001/10/01 14:42:38 bjornw Exp $
> > +# $Id: Makefile,v 1.3 2002/01/21 15:21:23 bjornw Exp $
> from 2001 -> 2002
>
> > -/* $Id: head.S,v 1.8 2001/10/03 17:15:15 bjornw Exp $
> > +/* $Id: head.S,v 1.2 2001/12/18 13:35:12 bjornw Exp $
> from october -> december

Ah yes, I was looking at version numbers rather than dates.

> looks ok to me, do I need more caffeine? :)

No, but I think I do. Thanks.

--
| Dave Jones. http://www.codemonkey.org.uk
| SuSE Labs