svn commit: r293070 - head/sys/conf

[Bjoern A. Zeeb]

> On 03 Jan 2016, at 04:38 , Garrett Cooper <ngie at FreeBSD.org> wrote:
> 
> Author: ngie
> Date: Sun Jan  3 04:38:17 2016
> New Revision: 293070
> URL: https://svnweb.freebsd.org/changeset/base/293070
> 
> Log:
>  Add "options ZFS" to NOTES so this will be tested with the LINT
>  KERNCONF when "make tinderbox" is run
> 
>  This will help ensure that "options ZFS" will not be accidentally
>  regressed, as the current LINT configuration tests the zfs module
> 

and it broke the build.

linking kernel
inflate.o: In function `inflate':
/scratch/tmp/bz/head.svn/sys/kern/inflate.c:(.text+0x0): multiple definition of `inflate'
inflate.o:/scratch/tmp/bz/head.svn/sys/kern/inflate.c:(.text+0x0): first defined here
zmod.o: In function `z_uncompress':
/scratch/tmp/bz/head.svn/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c:(.text+0x63): undefined reference to `z_inflateInit2_'
/scratch/tmp/bz/head.svn/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c:(.text+0x78): undefined reference to `z_inflate'
/scratch/tmp/bz/head.svn/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c:(.text+0x92): undefined reference to `z_inflateEnd'
/scratch/tmp/bz/head.svn/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c:(.text+0xa0): undefined reference to `z_inflateEnd'
--- kernel ---
*** [kernel] Error code 1

/bz