From owner-svn-src-all@freebsd.org  Fri Oct 23 08:12:02 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 60319A1A144;
 Fri, 23 Oct 2015 08:12:02 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2A3C035D;
 Fri, 23 Oct 2015 08:12:02 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9N8C1fP084129;
 Fri, 23 Oct 2015 08:12:01 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9N8C1Yb084126;
 Fri, 23 Oct 2015 08:12:01 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201510230812.t9N8C1Yb084126@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 23 Oct 2015 08:12:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r289807 - in stable/10/cddl/lib: libzfs libzfs_core
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Oct 2015 08:12:02 -0000

Author: avg
Date: Fri Oct 23 08:12:00 2015
New Revision: 289807
URL: https://svnweb.freebsd.org/changeset/base/289807

Log:
  MFC r284409: Fix circular dependency between libzfs and libzfs_core
  
  By bapt.

Modified:
  stable/10/cddl/lib/libzfs/Makefile
  stable/10/cddl/lib/libzfs_core/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/lib/libzfs/Makefile
==============================================================================
--- stable/10/cddl/lib/libzfs/Makefile	Fri Oct 23 08:04:59 2015	(r289806)
+++ stable/10/cddl/lib/libzfs/Makefile	Fri Oct 23 08:12:00 2015	(r289807)
@@ -37,7 +37,6 @@ SRCS+=	libzfs_changelist.c \
 	zfs_comutil.c \
 	zfs_deleg.c \
 	zfs_fletcher.c \
-	zfs_ioctl_compat.c \
 	zfs_namecheck.c \
 	zfs_prop.c \
 	zpool_prop.c \

Modified: stable/10/cddl/lib/libzfs_core/Makefile
==============================================================================
--- stable/10/cddl/lib/libzfs_core/Makefile	Fri Oct 23 08:04:59 2015	(r289806)
+++ stable/10/cddl/lib/libzfs_core/Makefile	Fri Oct 23 08:12:00 2015	(r289807)
@@ -11,7 +11,8 @@ DPADD=	${LIBNVPAIR}
 LDADD=	-lnvpair
 
 SRCS=	libzfs_core.c \
-	libzfs_core_compat.c
+	libzfs_core_compat.c \
+	zfs_ioctl_compat.c
 
 SRCS+=	libzfs_compat.c