Index: stable/9/cddl/lib/libzfs/Makefile
===================================================================
--- stable/9/cddl/lib/libzfs/Makefile	(revision 289807)
+++ stable/9/cddl/lib/libzfs/Makefile	(revision 289808)
@@ -1,61 +1,60 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
 
 LIB=	zfs
 DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
 	${LIBAVL} ${LIBZFS_CORE}
 LDADD=	-lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core
 
 SRCS=	deviceid.c \
 	fsshare.c \
 	mkdirp.c \
 	mnttab.c \
 	zmount.c \
 	zone.c
 
 SRCS+=	libzfs_changelist.c \
 	libzfs_compat.c \
 	libzfs_config.c \
 	libzfs_dataset.c \
 	libzfs_diff.c \
 	libzfs_import.c \
 	libzfs_iter.c \
 	libzfs_mount.c \
 	libzfs_pool.c \
 	libzfs_sendrecv.c \
 	libzfs_status.c \
 	libzfs_util.c \
 	zfeature_common.c \
 	zfs_comutil.c \
 	zfs_deleg.c \
 	zfs_fletcher.c \
-	zfs_ioctl_compat.c \
 	zfs_namecheck.c \
 	zfs_prop.c \
 	zpool_prop.c \
 	zprop_common.c \
 
 WARNS?=	0
 CSTD=	c99
 CFLAGS+= -DZFS_NO_ACL
 CFLAGS+= -I${.CURDIR}/../../../sbin/mount
 CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
 
 .include <bsd.lib.mk>
Index: stable/9/cddl/lib/libzfs
===================================================================
--- stable/9/cddl/lib/libzfs	(revision 289807)
+++ stable/9/cddl/lib/libzfs	(revision 289808)

Property changes on: stable/9/cddl/lib/libzfs
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,4 ##
   Merged /projects/largeSMP/cddl/lib/libzfs:r221273-222812,222815-223757
   Merged /vendor/resolver/dist/cddl/lib/libzfs:r1540-186085
   Merged /projects/quota64/cddl/lib/libzfs:r184125-207707
   Merged /head/cddl/lib/libzfs:r226702,226940,227006,228103,229067,236884,238926,240415,240868,248571,248708,249526,249600,250574,266520,284409
Index: stable/9/cddl/lib/libzfs_core/Makefile
===================================================================
--- stable/9/cddl/lib/libzfs_core/Makefile	(revision 289807)
+++ stable/9/cddl/lib/libzfs_core/Makefile	(revision 289808)
@@ -1,37 +1,38 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
 
 LIB=	zfs_core
 DPADD=	${LIBNVPAIR}
 LDADD=	-lnvpair
 
 SRCS=	libzfs_core.c \
-	libzfs_core_compat.c
+	libzfs_core_compat.c \
+	zfs_ioctl_compat.c
 
 SRCS+=	libzfs_compat.c
 
 WARNS?=	0
 CSTD=	c99
 CFLAGS+= -DZFS_NO_ACL
 CFLAGS+= -I${.CURDIR}/../../../sbin/mount
 CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
 
 .include <bsd.lib.mk>
Index: stable/9/cddl/lib/libzfs_core
===================================================================
--- stable/9/cddl/lib/libzfs_core	(revision 289807)
+++ stable/9/cddl/lib/libzfs_core	(revision 289808)

Property changes on: stable/9/cddl/lib/libzfs_core
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,4 ##
   Merged /head/cddl/lib/libzfs_core:r226702,226940,227006,228103,229067,236884,238926,240415,240868,248571,248708,249526,249600,250574,266520,284409
   Merged /projects/largeSMP/cddl/lib/libzfs_core:r221273-222812,222815-223757
   Merged /vendor/resolver/dist/cddl/lib/libzfs_core:r1540-186085
   Merged /projects/quota64/cddl/lib/libzfs_core:r184125-207707