Subject: Re: linux-2.4.10-acX
To: louisg00@bellsouth.net (Louis Garcia)
Date: Mon, 8 Oct 2001 19:07:12 +0100 (BST)
Cc: linux-kernel@vger.kernel.org
In-Reply-To: <1002562837.8724.4.camel@tiger> from "Louis Garcia" at Oct 08, 2001 01:40:37 PM
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-Id: <E15qeo4-0001MW-00@the-village.bc.nu>
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Sender: linux-kernel-owner@vger.kernel.org

> Has Alan's tree been fully merged with Linus's?? Or are their bits in
> Linus's tree that is not in Alan's?

There are measurable differences between the two trees. Notably

-	Linus uses the Andrea VM in 2.4.10
	-ac uses the Riel VM in 2.4.10-ac

The -ac tree also has the following major additions

-	Platform support for x86_64, usermode linux , etc
-	32bit uid safe quota
-	Ext3 file system
-	PnPBIOS support
-	Various PPro and Pentium workarounds
-	Simple boot flag
-	Faster x86 syscall path
-	PPPoATM
-	Elevator flow control
-	DRM 4.0 and 4.1 support not just 4.1 (ie XFree 4.0.x works)
-	CMS file system
-	Intermezzo file system
-	isofs compression

and drivers for

-	IB700
-	IBM Mwave 
-	Lots more MTD devices
-	SA1100 PCMCIA
-	Various USB toys

and then lots of bug fixes

Much of that will go on to Linus. Some he has refused (faster syscall path,
elevator flow control, ..). It takes time to feed stuff on and often I want
to test it in -ac first. Because so much changed in 2.4.10/11pre it's now
getting very hard to merge a lot of the fixes like the truncate standards
compliance stuff so they may not make Linus tree until 2.5


Alan
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/