svn commit: r293091 - head/sys/conf

Garrett Cooper ngie at FreeBSD.org
Sun Jan 3 08:48:25 UTC 2016


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


More information about the svn-src-head mailing list