From owner-svn-src-head@freebsd.org  Sun Jan  3 08:48:25 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 073CAA60A4D;
 Sun,  3 Jan 2016 08:48:25 +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 C10171254;
 Sun,  3 Jan 2016 08:48:24 +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 u038mNM9019792;
 Sun, 3 Jan 2016 08:48:23 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u038mN1d019791;
 Sun, 3 Jan 2016 08:48:23 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601030848.u038mN1d019791@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 08:48:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r293091 - 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-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Jan 2016 08:48:25 -0000

Author: ngie
Date: Sun Jan  3 08:48:23 2016
New Revision: 293091
URL: https://svnweb.freebsd.org/changeset/base/293091

Log:
  Revert r293070
  
  It seems that `options GZIP` and `options ZFS` collide because they both
  define inconsistent definitions for inflate, etc
  
  Fixing this will require upgrading zlib in the kernel, as suggested in
  r245102.
  
  Pointyhat to: ngie
  Reported by: bz
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/conf/NOTES

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Sun Jan  3 08:30:18 2016	(r293090)
+++ head/sys/conf/NOTES	Sun Jan  3 08:48:23 2016	(r293091)
@@ -3012,6 +3012,3 @@ 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