From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from www.linux.org.uk (parcelfarce.linux.theplanet.co.uk [195.92.249.252]) by dsl2.external.hp.com (Postfix) with ESMTP id 3B1EE4A18 for ; Thu, 1 Feb 2001 19:52:20 -0700 (MST) Received: from willy by www.linux.org.uk with local (Exim 3.13 #1) id 14OWKR-00026z-00; Fri, 02 Feb 2001 02:52:03 +0000 Date: Fri, 2 Feb 2001 02:52:03 +0000 From: Matthew Wilcox To: Andrew Shugg Cc: Linux/HPPA List Subject: Re: [parisc-linux] linux-2.4.0 Message-ID: <20010202025203.C32691@parcelfarce.linux.theplanet.co.uk> References: <20010126030440.A18813@parcelfarce.linux.theplanet.co.uk> <20010201024930.U4656@neep.com.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20010201024930.U4656@neep.com.au>; from andrew@neep.com.au on Thu, Feb 01, 2001 at 02:49:32AM +0800 Sender: List-ID: On Thu, Feb 01, 2001 at 02:49:32AM +0800, Andrew Shugg wrote: > Alan Cox said: > > > just for giggles, i merged 2.4.1-pre10 into our tree. no conflicts. > > > > Bad move. 2.4.1 is incredibly broken and unstable. Stay at 2.4.0 for testing > > Darn. What did you call the tag before the merge, Mr Wilcx? Why, LINUS_241_PREMERGE, following our normal convention, of course. OK, OK, I forgot to lay down the tag. But I've laid it down retroactively. I'm about to back the 2.4.1 merge out of the tree, let's see if this works. -- Revolutions do not require corporate support.