From owner-svn-src-all@FreeBSD.ORG  Mon Jan 16 17:39:05 2012
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 8EB061065670;
	Mon, 16 Jan 2012 17:39: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 4A2958FC16;
	Mon, 16 Jan 2012 17:39:03 +0000 (UTC)
Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua
	[212.40.38.101])
	by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id TAA23977;
	Mon, 16 Jan 2012 19:39:02 +0200 (EET) (envelope-from avg@FreeBSD.org)
Message-ID: <4F1460B5.9000502@FreeBSD.org>
Date: Mon, 16 Jan 2012 19:39:01 +0200
From: Andriy Gapon <avg@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
	rv:8.0) Gecko/20111109 Thunderbird/8.0
MIME-Version: 1.0
To: Jim Harris <jimharris@FreeBSD.org>
References: <201201161730.q0GHU15C044068@svn.freebsd.org>
In-Reply-To: <201201161730.q0GHU15C044068@svn.freebsd.org>
X-Enigmail-Version: undefined
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org,
	src-committers@FreeBSD.org, svn-src-stable-9@FreeBSD.org,
	Sean Bruno <sbruno@FreeBSD.org>
Subject: Re: svn commit: r230223 - in stable/9/sys/dev: ahci ata 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: Mon, 16 Jan 2012 17:39:05 -0000

on 16/01/2012 19:30 Jim Harris said the following:
[snip]
> Modified:
>   stable/9/sys/dev/ahci/ahci.c
>   stable/9/sys/dev/ata/ata-pci.h
>   stable/9/sys/dev/ata/chipsets/ata-intel.c
> Directory Properties:
>   stable/9/   (props changed)
>   stable/9/sys/   (props changed)
[snip]

The last two lines look incorrect.
Are you following http://wiki.freebsd.org/SubversionPrimer/Merging ?
Namely, this change should have been svn-merged to the 'sys' sub-directory.

-- 
Andriy Gapon