From owner-svn-src-stable@freebsd.org  Sun Feb 28 12:37:26 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B36AAAA7432;
 Sun, 28 Feb 2016 12:37:26 +0000 (UTC) (envelope-from slw@zxy.spb.ru)
Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 76EA2A9;
 Sun, 28 Feb 2016 12:37:26 +0000 (UTC) (envelope-from slw@zxy.spb.ru)
Received: from slw by zxy.spb.ru with local (Exim 4.86 (FreeBSD))
 (envelope-from <slw@zxy.spb.ru>)
 id 1aa0bE-000HNB-62; Sun, 28 Feb 2016 15:37:24 +0300
Date: Sun, 28 Feb 2016 15:37:24 +0300
From: Slawa Olhovchenkov <slw@zxy.spb.ru>
To: Brooks Davis <brooks@freebsd.org>
Cc: Bryan Drewery <bdrewery@FreeBSD.org>, src-committers@freebsd.org,
 svn-src-all@freebsd.org, svn-src-stable@freebsd.org,
 svn-src-stable-9@freebsd.org
Subject: Re: svn commit: r296146 - stable/9/sys/dev/filemon
Message-ID: <20160228123724.GC11654@zxy.spb.ru>
References: <201602272057.u1RKvYfF035338@repo.freebsd.org>
 <20160228102728.GA94639@zxy.spb.ru>
 <20160228122008.GA27425@spindle.one-eyed-alien.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160228122008.GA27425@spindle.one-eyed-alien.net>
User-Agent: Mutt/1.5.24 (2015-08-30)
X-SA-Exim-Connect-IP: <locally generated>
X-SA-Exim-Mail-From: slw@zxy.spb.ru
X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Feb 2016 12:37:26 -0000

On Sun, Feb 28, 2016 at 12:20:09PM +0000, Brooks Davis wrote:

> On Sun, Feb 28, 2016 at 01:27:28PM +0300, Slawa Olhovchenkov wrote:
> > On Sat, Feb 27, 2016 at 08:57:34PM +0000, Bryan Drewery wrote:
> > 
> > > Author: bdrewery
> > > Date: Sat Feb 27 20:57:34 2016
> > > New Revision: 296146
> > > URL: https://svnweb.freebsd.org/changeset/base/296146
> > > 
> > > Log:
> > >   MFC r242088:
> > >   
> > >     Desupport pre-FreeBSD 7.1.
> > > 
> > > Modified:
> > >   stable/9/sys/dev/filemon/filemon.c
> > > Directory Properties:
> > >   stable/9/sys/   (props changed)
> > >   stable/9/sys/dev/   (props changed)
> > > -#if __FreeBSD_version < 701000
> > 
> > Not specialy to this commit, just for information: what purpose to
> > have in src tree, already divided to branches, pieces of code under
> > #if?
> > 
> > Of couse, question not about external maintained code.
> 
> Filemon started as externally maintained code and initially it was
> a bit ambiguous which direction changes would flow.

I.e. historical behaviour.

> Sometimes it's also useful to allow code in HEAD to just work when
> copied to stable so people can see if their problem is fixed without
> having to merge too much.

Please, check me: in mostly cases this is equivalent of MFC in one
commit (and have same complexity as MFC) but w/o actualy MFC.

> In general though, we should remove code like
> this in things maintained entirely in tree.

Thanks!