From owner-freebsd-stable@FreeBSD.ORG  Tue May 19 21:29:24 2009
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE5A3106566B
	for <freebsd-stable@freebsd.org>; Tue, 19 May 2009 21:29:24 +0000 (UTC)
	(envelope-from dimitry@andric.com)
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 ACC898FC1A
	for <freebsd-stable@freebsd.org>; Tue, 19 May 2009 21:29:24 +0000 (UTC)
	(envelope-from dimitry@andric.com)
Received: from [IPv6:2001:7b8:3a7:0:1dc8:f31e:251e:727c] (unknown
	[IPv6:2001:7b8:3a7:0:1dc8:f31e:251e:727c])
	(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by tensor.andric.com (Postfix) with ESMTPSA id 0560D5C42;
	Tue, 19 May 2009 23:29:24 +0200 (CEST)
Message-ID: <4A1324B4.9080105@andric.com>
Date: Tue, 19 May 2009 23:29:24 +0200
From: Dimitry Andric <dimitry@andric.com>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US;
	rv:1.9.1b5pre) Gecko/20090515 Shredder/3.0b3pre
MIME-Version: 1.0
To: Dmitry Morozovsky <marck@rinet.ru>
References: <3c1674c90905151702l81c2b88off1d2b2ffed39ca2@mail.gmail.com>
	<4A11A666.3030407@andric.com>
	<alpine.BSF.2.00.0905191532370.23397@woozle.rinet.ru>
	<4A12E929.4040406@andric.com>
	<alpine.BSF.2.00.0905200009060.44708@woozle.rinet.ru>
	<4A1317C9.90505@andric.com>
	<alpine.BSF.2.00.0905200048070.44708@woozle.rinet.ru>
	<alpine.BSF.2.00.0905200107250.44708@woozle.rinet.ru>
In-Reply-To: <alpine.BSF.2.00.0905200107250.44708@woozle.rinet.ru>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: freebsd-stable@freebsd.org
Subject: Re: RFT: ZFS MFC
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 May 2009 21:29:25 -0000

On 2009-05-19 23:08, Dmitry Morozovsky wrote:
> After cleaning /usr/obj and buildworld in single thread I got
> 
> /usr/src/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/acl.h:35: 
> error: conflicting types for 'aclent_t'
> /usr/src/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/uts/common/sys/acl.h:43: 
> error: previous declaration of 'aclent_t' was here

You probably didn't use -E with patch, the following files can be
removed manually afterwards:

sys/cddl/compat/opensolaris/sys/acl.h
sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S
sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S
sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S
sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S
sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c
sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c
sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c
sys/cddl/contrib/opensolaris/uts/common/sys/vfs.h
sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c

My copy is currently still buildworlding, and hasn't failed yet...