From owner-cvs-all Tue Jan 29 10:48:18 2002 Delivered-To: cvs-all@freebsd.org Received: from mail.imp.ch (mail.imp.ch [157.161.1.2]) by hub.freebsd.org (Postfix) with ESMTP id 0307137B402; Tue, 29 Jan 2002 10:48:13 -0800 (PST) Received: from levais.imp.ch (levais.imp.ch [157.161.4.66]) by mail.imp.ch (8.11.1/8.11.1) with ESMTP id g0TImBd85189; Tue, 29 Jan 2002 19:48:11 +0100 (CET) (envelope-from Martin.Blapp@imp.ch) Date: Tue, 29 Jan 2002 19:48:27 +0100 (CET) From: Martin Blapp To: Robert Watson Cc: "M. Warner Losh" , , Subject: Re: RELENG confusion RELENG_4 RELENG_4_5 In-Reply-To: Message-ID: <20020129194400.P447-100000@levais.imp.ch> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Hi Robert, > Are you referring to something specific here? If not, it doesn't appear > to mean much. If so, you need to say what it is you're talking about so > that it can be fixed. In general, RELENG_4 and RELENG_4_5 should > currently be feature-identical, and the only differences should be in the > form of version strings, release notes, and so on. Yeah. The vinum changes from greg: http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/vinum/vinumconfig.c ( Revision 1.32.2.5.4.1) http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/vinum/vinumioctl.c ( Revision 1.25.2.3.6.1) They are not present in STABLE RELENG_4. So I've to merge there everywhere on our machines tracking STABLE. Martin To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message