From 3260b587db44b4e61fa6c3babe0282054c38ba62 Mon Sep 17 00:00:00 2001 From: ngie Date: Sun, 3 Jan 2016 08:48:23 +0000 Subject: 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 --- sys/conf/NOTES | 3 --- 1 file changed, 3 deletions(-) (limited to 'sys/conf') diff --git a/sys/conf/NOTES b/sys/conf/NOTES index e824445..3c64d5b 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -3012,6 +3012,3 @@ options EM_MULTIQUEUE # Activate multiqueue features/disable MSI-X # zlib I/O stream support # This enables support for compressed core dumps. options GZIO - -# ZFS (Zeta File System) support -options ZFS -- cgit v1.1