From owner-svn-src-stable-8@FreeBSD.ORG Sat Jul 30 17:26:05 2011 Return-Path: Delivered-To: svn-src-stable-8@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 91547106566C; Sat, 30 Jul 2011 17:26:05 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 0F31A8FC08; Sat, 30 Jul 2011 17:26:03 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id UAA28655; Sat, 30 Jul 2011 20:26:02 +0300 (EEST) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1QnDIY-0008Gw-0I; Sat, 30 Jul 2011 20:26:02 +0300 Message-ID: <4E343EA8.6010609@FreeBSD.org> Date: Sat, 30 Jul 2011 20:26:00 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:5.0) Gecko/20110706 Thunderbird/5.0 MIME-Version: 1.0 To: Dimitry Andric References: <201107290958.p6T9wum1042480@svn.freebsd.org> <4E332CF8.6080002@FreeBSD.org> <4E341862.9000805@FreeBSD.org> In-Reply-To: <4E341862.9000805@FreeBSD.org> X-Enigmail-Version: 1.2pre Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, svn-src-stable-8@FreeBSD.org Subject: Re: svn commit: r224490 - in stable/8/sys/dev/ata: . chipsets X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jul 2011 17:26:05 -0000 on 30/07/2011 17:42 Dimitry Andric said the following: > On 2011-07-29 23:58, Andriy Gapon wrote: >> Picking a random stable/8 sys commit: >> >> on 29/07/2011 12:58 Alexander Motin said the following: >>> Modified: >>> stable/8/sys/dev/ata/ata-pci.c >>> stable/8/sys/dev/ata/ata-pci.h >>> stable/8/sys/dev/ata/chipsets/ata-acard.c >>> stable/8/sys/dev/ata/chipsets/ata-acerlabs.c >>> stable/8/sys/dev/ata/chipsets/ata-intel.c >>> stable/8/sys/dev/ata/chipsets/ata-promise.c >>> Directory Properties: >>> stable/8/sys/ (props changed) >>> stable/8/sys/amd64/include/xen/ (props changed) >>> stable/8/sys/cddl/contrib/opensolaris/ (props changed) >>> stable/8/sys/contrib/dev/acpica/ (props changed) >>> stable/8/sys/contrib/pf/ (props changed) >>> stable/8/sys/geom/label/ (props changed) >> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ >> Why do we have this now? > > Because the merging instructions say: > > "Changes to kernel code should be merged to sys. For instance, a change > to the ichwd(4) driver should be merged to sys, not sys/dev/ichwd. > Likewise, a change to the TCP/IP stack should be merged to sys, not > sys/netinet." > > So any merge from head to stable/x will also update the directories that > already have svn:mergeinfo properties, namely those listed above. Maybe my question was not clear enough, so I'll ask it differently. Why do we have mergeinfo on stable/8/sys/geom/label now? -- Andriy Gapon