cvs commit: src UPDATING src/sys/netgraph netgraph.h ng_message.h src/sys/netgraph/bluetooth/include ng_btsocket.h

[M. Warner Losh]

In message: <20040820123859.GC1196 at electra.cse.Buffalo.EDU>
            Ken Smith <kensmith at cse.Buffalo.EDU> writes:
: 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...  :-(

Of course MFC After just generates email to the person doing the
commit as a reminder..  One would presume that they would know where
they are going to merge it.  And if they are doing an N way merge,
they can always use stage N-1 to clock stage N (eg when merging to 5,
they could have a MFC for the merge to 4).

Warner