From owner-svn-src-head@FreeBSD.ORG Sat Mar 23 15:47:45 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 CD8A353F;
Sat, 23 Mar 2013 15:47:45 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from mx1.sbone.de (bird.sbone.de [46.4.1.90])
by mx1.freebsd.org (Postfix) with ESMTP id 2015AA02;
Sat, 23 Mar 2013 15:47:44 +0000 (UTC)
Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by mx1.sbone.de (Postfix) with ESMTPS id 08CA925D3815;
Sat, 23 Mar 2013 15:47:36 +0000 (UTC)
Received: from content-filter.sbone.de (content-filter.sbone.de
[IPv6:fde9:577b:c1a9:31::2013:2742])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(No client certificate requested)
by mail.sbone.de (Postfix) with ESMTPS id 20BEEBE84AE;
Sat, 23 Mar 2013 15:47:36 +0000 (UTC)
X-Virus-Scanned: amavisd-new at sbone.de
Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587])
by content-filter.sbone.de (content-filter.sbone.de
[fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024)
with ESMTP id 8Nh_oc9lDsVc; Sat, 23 Mar 2013 15:47:34 +0000 (UTC)
Received: from nv.sbone.de (nv.sbone.de [IPv6:fde9:577b:c1a9:31::2013:138])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(No client certificate requested)
by mail.sbone.de (Postfix) with ESMTPSA id 0D881BE849B;
Sat, 23 Mar 2013 15:47:34 +0000 (UTC)
Date: Sat, 23 Mar 2013 15:47:33 +0000 (UTC)
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
To: Martin Matuska <mm@FreeBSD.org>, Peter Wemm <peter@freebsd.org>
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...
In-Reply-To: <201303210838.r2L8c3OB097432@svn.freebsd.org>
Message-ID: <alpine.BSF.2.00.1303231544400.4228@ai.fobar.qr>
References: <201303210838.r2L8c3OB097432@svn.freebsd.org>
X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
src-committers@freebsd.org
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
<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Mar 2013 15:47:45 -0000
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}"
--
Bjoern A. Zeeb Charles Haddon Spurgeon:
"Friendship is one of the sweetest joys of life. Many might have failed
beneath the bitterness of their trial had they not found a friend."