From owner-svn-src-head@FreeBSD.ORG Sat Mar 23 20:02:11 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 921A8FFC; Sat, 23 Mar 2013 20:02:11 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [IPv6:2a01:4f8:150:6101::4]) by mx1.freebsd.org (Postfix) with ESMTP id 1CC20255; Sat, 23 Mar 2013 20:02:11 +0000 (UTC) Received: from core.vx.sk (localhost [127.0.0.2]) by mail.vx.sk (Postfix) with ESMTP id 3737C27ADE; Sat, 23 Mar 2013 21:02:10 +0100 (CET) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by core.vx.sk (amavisd-new, unix socket) with LMTP id hJy18GEvERkx; Sat, 23 Mar 2013 21:02:08 +0100 (CET) Received: from [10.9.8.1] (chello085216226145.chello.sk [85.216.226.145]) by mail.vx.sk (Postfix) with ESMTPSA id 2C5EE27AD4; Sat, 23 Mar 2013 21:02:08 +0100 (CET) Message-ID: <514E0A3D.6000706@FreeBSD.org> Date: Sat, 23 Mar 2013 21:02:05 +0100 From: Martin Matuska User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130307 Thunderbird/17.0.4 MIME-Version: 1.0 To: "Bjoern A. Zeeb" Subject: Re: svn commit: r248571 - in head: . cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zhack cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/cmd... References: <201303210838.r2L8c3OB097432@svn.freebsd.org> In-Reply-To: X-Enigmail-Version: 1.5.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Peter Wemm X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Mar 2013 20:02:11 -0000 Fixed in r248659. Thanks. On 23.3.2013 16:47, Bjoern A. Zeeb wrote: > On Thu, 21 Mar 2013, Martin Matuska wrote: > >> Author: mm >> Date: Thu Mar 21 08:38:03 2013 >> New Revision: 248571 >> URL: http://svnweb.freebsd.org/changeset/base/248571 >> >> Log: >> Merge libzfs_core branch: >> includes MFV 238590, 238592, 247580 > ... >> Added: >> head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c >> - copied unchanged from r248551, >> projects/libzfs_core/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c >> head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.h >> - copied unchanged from r248551, >> projects/libzfs_core/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.h >> head/cddl/contrib/opensolaris/lib/libzfs_core/ >> - copied from r248551, >> projects/libzfs_core/cddl/contrib/opensolaris/lib/libzfs_core/ >> head/cddl/lib/libzfs_core/ >> - copied from r248551, projects/libzfs_core/cddl/lib/libzfs_core/ >> head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c >> - copied unchanged from r248551, >> projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c >> head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c >> - copied unchanged from r248551, >> projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c >> head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h >> - copied unchanged from r248551, >> projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h >> head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h >> - copied unchanged from r248551, >> projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h >> head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_userhold.h >> - copied unchanged from r248551, >> projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_userhold.h > > > in the theoretical event someone would want to compile zfs into the > kernel, > given r233578 added support for that, one would need this: > > mm, peter? > > Index: sys/conf/files > =================================================================== > --- sys/conf/files (revision 248649) > +++ sys/conf/files (working copy) > @@ -197,11 +197,13 @@ cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_s > cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c optional > zfs compile-with "${ZFS_C}" > cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c optional > zfs compile-with "${ZFS_C}" > cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c optional > zfs compile-with "${ZFS_C}" > +cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c optional > zfs compile-with "${ZFS_C}" > cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c optional > zfs compile-with "${ZFS_C}" > cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c optional > zfs compile-with "${ZFS_C}" > cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c optional > zfs compile-with "${ZFS_C}" > cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c optional > zfs compile-with "${ZFS_C}" > cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c optional > zfs compile-with "${ZFS_C}" > +cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c optional > zfs compile-with "${ZFS_C}" > cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c optional > zfs compile-with "${ZFS_C}" > cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c optional > zfs compile-with "${ZFS_C}" > cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c optional > zfs compile-with "${ZFS_C}" > > -- Martin Matuska FreeBSD committer http://blog.vx.sk