RFT: ZFS MFC

[Dimitry Andric]

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...