From owner-svn-src-all@FreeBSD.ORG Thu Jan 2 04:55:24 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 03275F3D; Thu, 2 Jan 2014 04:55:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E32241443; Thu, 2 Jan 2014 04:55:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s024tNJT013957; Thu, 2 Jan 2014 04:55:23 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s024tNRr013956; Thu, 2 Jan 2014 04:55:23 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201401020455.s024tNRr013956@svn.freebsd.org> From: Xin LI Date: Thu, 2 Jan 2014 04:55:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r260182 - vendor-sys/illumos/dist/uts/common X-SVN-Group: vendor-sys 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.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 04:55:24 -0000 Author: delphij Date: Thu Jan 2 04:55:23 2014 New Revision: 260182 URL: http://svnweb.freebsd.org/changeset/base/260182 Log: Import a file overlooked in r260154. 4369 implement zfs bookmarks 4368 zfs send filesystems from readonly pools illumos/illumos-gate@78f171005391b928aaf1642b3206c534ed644332 Modified: vendor-sys/illumos/dist/uts/common/Makefile.files Modified: vendor-sys/illumos/dist/uts/common/Makefile.files ============================================================================== --- vendor-sys/illumos/dist/uts/common/Makefile.files Thu Jan 2 03:24:44 2014 (r260181) +++ vendor-sys/illumos/dist/uts/common/Makefile.files Thu Jan 2 04:55:23 2014 (r260182) @@ -1343,6 +1343,7 @@ ZFS_COMMON_OBJS += \ dmu_tx.o \ dnode.o \ dnode_sync.o \ + dsl_bookmark.o \ dsl_dir.o \ dsl_dataset.o \ dsl_deadlist.o \