Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 May 2008 08:50:24 +0100 (BST)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Daniel Eischen <deischen@freebsd.org>
Cc:        Maxim Sobolev <sobomax@freebsd.org>, src-committers@freebsd.org, d@delphij.net, cvs-src@freebsd.org, cvs-all@freebsd.org, Xin LI <delphij@freebsd.org>, re@freebsd.org, David Schultz <das@freebsd.org>
Subject:   Re: cvs commit: src/include string.h src/lib/libc/string Makefile.inc memchr.3 memrchr.c src/sys/sys param.h
Message-ID:  <20080529084608.X39873@fledge.watson.org>
In-Reply-To: <Pine.GSO.4.64.0805281049150.7240@sea.ntplx.net>
References:  <200805272004.m4RK4SZt029194@repoman.freebsd.org> <483C7FF2.6000607@FreeBSD.org> <483C977F.20105@delphij.net> <20080528060333.GA4699@zim.MIT.EDU> <Pine.GSO.4.64.0805281049150.7240@sea.ntplx.net>

next in thread | previous in thread | raw e-mail | index | archive | help

On Wed, 28 May 2008, Daniel Eischen wrote:

> There's nothing technically wrong with it in that it will work, but for 
> minor features that provide low marginal utility, I'm not sure that it is 
> warranted.  I would rather see the bar raised for new features added to 
> -stable branches.  But I don't feel strongly enough one way or the other to 
> request a backout.

I think there's actually a strong contrary argument to this in the general 
case: the things we should try hardest to MFC are the most trivial changes, as 
those changes have the lowest risk and highest utility in reducing gratuitous 
differences between branches.  The more "minor" changes present in HEAD vs a 
RELENG_ branch, the harder it is to merge larger functional changes: there may 
be conflicting diffs, subtle dependencies, etc.

I don't have any specific cases in mind for this particular function, but 
certainly in the network stack and elsewhere in the kernel, there is a strong 
motivation to merge quickly and frequently for minor changes so that they 
don't build up over time and make other, more important, changes harder to 
merge.  The more we allow 8.x and 7.x to diverge, the harder it will be to 
bring back changes and keep the 7.x branch running in the long term, and the 
more likely it is that when we run into harder merges later.

So, this is neither a vote for nor against a backout, but this is a general 
call to resist the conservative tendancy that says "don't MFC minor things" 
because, in macro, it has a significant drag effect on the MFC process that 
keeps RELENG branches maintainable.

Robert N M Watson
Computer Laboratory
University of Cambridge



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080529084608.X39873>