diff options
| author | ngie <ngie@FreeBSD.org> | 2016-01-03 08:48:23 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2016-01-03 08:48:23 +0000 |
| commit | 3260b587db44b4e61fa6c3babe0282054c38ba62 (patch) | |
| tree | c8c58eb48f011589649db351e65aa8c4e96cb7aa /sys/conf | |
| parent | 56891f5bbd867c34df21e1c84d3eaaf2346a5980 (diff) | |
| download | FreeBSD-src-3260b587db44b4e61fa6c3babe0282054c38ba62.zip FreeBSD-src-3260b587db44b4e61fa6c3babe0282054c38ba62.tar.gz | |
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
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/NOTES | 3 |
1 files changed, 0 insertions, 3 deletions
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 |
