From owner-cvs-src@FreeBSD.ORG  Fri Aug 20 13:17:38 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
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 EB08E16A4CE; Fri, 20 Aug 2004 13:17:38 +0000 (GMT)
Received: from srv01.sparkit.no (srv01.sparkit.no [193.69.116.226])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 54B5143D49; Fri, 20 Aug 2004 13:17:38 +0000 (GMT)
	(envelope-from eivind@FreeBSD.org)
Received: from ws.nada ([193.69.114.88])
	by srv01.sparkit.no (8.12.11/8.12.11) with ESMTP id i7KDHOFI079689;
	Fri, 20 Aug 2004 15:17:28 +0200 (CEST)
	(envelope-from eivind@FreeBSD.org)
Received: from ws.nada (localhost [127.0.0.1])
	by ws.nada (8.12.9/8.12.10) with ESMTP id i7KDEtSv017928;
	Fri, 20 Aug 2004 13:14:55 GMT
	(envelope-from eivind@ws.nada)
Received: (from eivind@localhost)
	by ws.nada (8.12.9/8.12.10/Submit) id i7KDEtt7017927;
	Fri, 20 Aug 2004 13:14:55 GMT
	(envelope-from eivind)
Date: Fri, 20 Aug 2004 13:14:54 +0000
From: Eivind Eklund <eivind@FreeBSD.org>
To: Ken Smith <kensmith@cse.Buffalo.EDU>
Message-ID: <20040820131454.GD2388@FreeBSD.org>
References: <200408200124.i7K1ONcF095627@repoman.freebsd.org>
	<20040820081918.GC27365@ip.net.ua>
	<20040820123859.GC1196@electra.cse.Buffalo.EDU>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20040820123859.GC1196@electra.cse.Buffalo.EDU>
User-Agent: Mutt/1.5.4i
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
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 <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Aug 2004 13:17:39 -0000

On Fri, Aug 20, 2004 at 08:38:59AM -0400, Ken Smith wrote:
[... stuff about when MFC becomes "normal" again ...]

I suggest replacing "MFC" with "MT4" (merge to 4.x) and "MT5" (merge to
5) for the case where we are indicating planned merges.  We regularly
get into the situation where we have several branches to merge to, and
the MFC terminology is quite limiting.  MFC was introduced as a tag used
in commit messages when the merge was being done, and the "MFC after"
usage was a natural evolution at a point where any non-RELENG_4 MFC was
a quite special case.

Eivind.