From owner-svn-src-all@FreeBSD.ORG  Sat Jul 30 14:42:41 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CFB011065672;
	Sat, 30 Jul 2011 14:42:41 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from tensor.andric.com (cl-327.ede-01.nl.sixxs.net
	[IPv6:2001:7b8:2ff:146::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 9008B8FC0C;
	Sat, 30 Jul 2011 14:42:41 +0000 (UTC)
Received: from [IPv6:2001:7b8:3a7:0:d9fd:71cc:37a8:cf48] (unknown
	[IPv6:2001:7b8:3a7:0:d9fd:71cc:37a8:cf48])
	(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by tensor.andric.com (Postfix) with ESMTPSA id E40615C37;
	Sat, 30 Jul 2011 16:42:39 +0200 (CEST)
Message-ID: <4E341862.9000805@FreeBSD.org>
Date: Sat, 30 Jul 2011 16:42:42 +0200
From: Dimitry Andric <dim@FreeBSD.org>
Organization: The FreeBSD Project
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
	rv:5.0) Gecko/20110624 Thunderbird/5.0
MIME-Version: 1.0
To: Andriy Gapon <avg@FreeBSD.org>
References: <201107290958.p6T9wum1042480@svn.freebsd.org>
	<4E332CF8.6080002@FreeBSD.org>
In-Reply-To: <4E332CF8.6080002@FreeBSD.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
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-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jul 2011 14:42:41 -0000

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.