From owner-cvs-src@FreeBSD.ORG Fri Aug 20 12:39:00 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B23A016A4D5; Fri, 20 Aug 2004 12:39:00 +0000 (GMT) Received: from electra.cse.Buffalo.EDU (electra.cse.Buffalo.EDU [128.205.32.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57A5443D2D; Fri, 20 Aug 2004 12:39:00 +0000 (GMT) (envelope-from kensmith@cse.Buffalo.EDU) Received: from electra.cse.Buffalo.EDU (kensmith@localhost [127.0.0.1]) i7KCcxTH001627; Fri, 20 Aug 2004 08:38:59 -0400 (EDT) Received: (from kensmith@localhost) by electra.cse.Buffalo.EDU (8.12.10/8.12.9/Submit) id i7KCcxoE001626; Fri, 20 Aug 2004 08:38:59 -0400 (EDT) Date: Fri, 20 Aug 2004 08:38:59 -0400 From: Ken Smith To: Ruslan Ermilov Message-ID: <20040820123859.GC1196@electra.cse.Buffalo.EDU> References: <200408200124.i7K1ONcF095627@repoman.freebsd.org> <20040820081918.GC27365@ip.net.ua> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20040820081918.GC27365@ip.net.ua> User-Agent: Mutt/1.4.1i cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: Julian Elischer cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src UPDATING src/sys/netgraph netgraph.h ng_message.h src/sys/netgraph/bluetooth/include ng_btsocket.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Aug 2004 12:39:01 -0000 On Fri, Aug 20, 2004 at 11:19:18AM +0300, Ruslan Ermilov wrote: > We need to be careful with using "MFC" now. What does it mean, RELENG_5, > RELENG_4, or both? ;) This problem will continue for a while too unfortunately. :-( If all goes as planned (which it never seems to...) shortly after the 5.X release RELENG_5 becomes -stable. HEAD as always will be -current. But RELENG_4 will still be an active development branch and the target of at least some normal developer-generated commits until we release 4.11. After 4.11 is released the current plan is to turn over RELENG_4 (as well as RELENG_4_11) to so@ and it becomes an Errata Branch. So, after the 4.11 release we'll be back to the normal terminology being adequate but until then it's gonna be a bit weird... :-( -- Ken Smith - From there to here, from here to | kensmith@cse.buffalo.edu there, funny things are everywhere. | - Theodore Geisel |