From owner-svn-src-stable@FreeBSD.ORG Thu Jul 9 20:48:35 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6AFCA10656B2 for ; Thu, 9 Jul 2009 20:48:35 +0000 (UTC) (envelope-from max@love2party.net) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.177]) by mx1.freebsd.org (Postfix) with ESMTP id D49178FC28 for ; Thu, 9 Jul 2009 20:48:34 +0000 (UTC) (envelope-from max@love2party.net) Received: from vampire.homelinux.org (dslb-088-066-043-124.pools.arcor-ip.net [88.66.43.124]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MKv1o-1MP0LW3zZa-00095q; Thu, 09 Jul 2009 22:35:59 +0200 Received: (qmail 81029 invoked from network); 9 Jul 2009 20:35:58 -0000 Received: from kvm.laiers.local (HELO kvm.localnet) (192.168.4.200) by router.laiers.local with SMTP; 9 Jul 2009 20:35:58 -0000 From: Max Laier Organization: FreeBSD To: Brian Somers Date: Thu, 9 Jul 2009 22:35:18 +0200 User-Agent: KMail/1.11.3 (Linux/2.6.30-rc5-ARCH; KDE/4.2.3; x86_64; ; ) References: <200907090912.n699CGx0077581@svn.freebsd.org> <20090709103126.02bf7206@Awfulhak.org> In-Reply-To: <20090709103126.02bf7206@Awfulhak.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200907092235.18828.max@love2party.net> X-Provags-ID: V01U2FsdGVkX1+1HYrYccpGZ4fY3FRaiV87d2VRGRl4HLWwOa9 CBu3WBy0SlZLQ8sbVLuA6iiMDY5pYx8jU51IdzzkwT512D5VRF KEtvu2Ts3in4tBkVa/rRg== Cc: svn-src-stable-7@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Konstantin Belousov Subject: Re: svn commit: r195485 - in stable/7/sys: . contrib/pf kern X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jul 2009 20:48:36 -0000 On Thursday 09 July 2009 19:31:26 Brian Somers wrote: > On Thu, 9 Jul 2009 09:12:16 +0000 (UTC), Konstantin Belousov wrote: > > Author: kib > > Date: Thu Jul 9 09:12:16 2009 > > New Revision: 195485 > > URL: http://svn.freebsd.org/changeset/base/195485 > > > > Log: > > MFC r194993: > > In lf_iteratelocks_vnode, increment state->ls_threads around iterating > > of the vnode advisory lock list. This prevents deallocation of state > > while inside the loop. > > > > Modified: > > stable/7/sys/ (props changed) > > stable/7/sys/contrib/pf/ (props changed) > > stable/7/sys/kern/kern_lockf.c > > Just picking on this commit.... > > Are the properties on stable/7/sys/contrib/pf intentional or should > they merged into stable/7/sys (a no-op hopefully) and removed? No it shouldn't[*]. The problem is that contrib/pf is - as the path suggests - backed by contributed code and thus has vendor specific merge info. [*] That being said, I don't really care about the merge info in there - as it turns out, subversion's automerging capabilities are rather poor anyway and I can't see the benefit of the mergeinfo in dealing with vendor code. It's always easy enough to figure out the revisions you want merged and you don't really need the mergeinfo for that. OTOH, it is valuable meta-information that should be recorded - as I recall that's one reason why we switched to subversion in the first place. One way out - which I proposed several times before but never got feedback on - would be to change the hierarchies in vendor-sys to have an extra sys/contrib prefix (e.g. vendor-sys/pf/dist/*sys/contrib*/pf/...). This way we can record the mergeinfo in src/sys as well and get rid of the extra info in contrib/* I'd need some feedback from svn-savvy people to go this road, though. Before somebody asks why pf is the only offender - simply because it's the only sys/contrib source with a post-cvs merge of vendor code to the releng. -- /"\ Best regards, | mlaier@freebsd.org \ / Max Laier | ICQ #67774661 X http://pf4freebsd.love2party.net/ | mlaier@EFnet / \ ASCII Ribbon Campaign | Against HTML Mail and News