From owner-svn-src-all@freebsd.org  Sun Jan  3 04:38:18 2016
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 E0991A5375C;
 Sun,  3 Jan 2016 04:38:18 +0000 (UTC)
 (envelope-from ngie@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 B1460121E;
 Sun,  3 Jan 2016 04:38:18 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u034cHUD043935;
 Sun, 3 Jan 2016 04:38:17 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u034cHSP043934;
 Sun, 3 Jan 2016 04:38:17 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601030438.u034cHSP043934@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 3 Jan 2016 04:38:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r293070 - head/sys/conf
X-SVN-Group: head
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: Sun, 03 Jan 2016 04:38:19 -0000

Author: ngie
Date: Sun Jan  3 04:38:17 2016
New Revision: 293070
URL: https://svnweb.freebsd.org/changeset/base/293070

Log:
  Add "options ZFS" to NOTES so this will be tested with the LINT
  KERNCONF when "make tinderbox" is run
  
  This will help ensure that "options ZFS" will not be accidentally
  regressed, as the current LINT configuration tests the zfs module
  
  MFC after: 3 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/conf/NOTES

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Sun Jan  3 04:32:13 2016	(r293069)
+++ head/sys/conf/NOTES	Sun Jan  3 04:38:17 2016	(r293070)
@@ -3012,3 +3012,6 @@ options		EM_MULTIQUEUE # Activate multiq
 # zlib I/O stream support
 # This enables support for compressed core dumps.
 options 	GZIO
+
+# ZFS (Zeta File System) support
+options		ZFS