]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Revert r293070
authorngie <ngie@FreeBSD.org>
Sun, 3 Jan 2016 08:48:23 +0000 (08:48 +0000)
committerngie <ngie@FreeBSD.org>
Sun, 3 Jan 2016 08:48:23 +0000 (08:48 +0000)
commit3260b587db44b4e61fa6c3babe0282054c38ba62
treec8c58eb48f011589649db351e65aa8c4e96cb7aa
parent56891f5bbd867c34df21e1c84d3eaaf2346a5980
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