PC-BSD / trueos / 44349bf / Merge branch 'stable/12' of https://github.com/freebsd/freebsd into freenas/12-stable

PC-BSD/trueos 44349bf — . .gitattributes, share/mk src.opts.mk

Merge branch 'stable/12' of https://github.com/freebsd/freebsd into freenas/12-stable

Delta		File
+12	-3	sys/cddl/boot/zfs/zfsimpl.h
+3	-3	stand/sparc64/loader/Makefile
+2	-2	stand/i386/loader/Makefile
+1	-1	stand/efi/libefi/Makefile
+1	-1	stand/efi/loader/Makefile
+1	-1	stand/i386/Makefile
+1	-1	stand/libsa/Makefile
+1	-1	stand/sparc64/Makefile
+1	-1	stand/userboot/userboot/Makefile
+1	-1	sys/sys/param.h
+2	-0	tools/build/options/WITHOUT_LOADER_ZFS
+1	-1	tools/build/options/WITHOUT_ZFS
+2	-0	share/mk/src.opts.mk
+1	-1	stand/efi/boot1/Makefile
+1	-0	.gitattributes
+31	-17	15 files