Andriy Gapon 54d1762459 fix up r354804, resolve merge conflicts in zpool.8 ... Somehow I managed to commit the manual page with unresolved conflicts in it. While here, I also replaced .sp with .Pp. MFC after: 3 weeks X-MFC with: r354804		2019-11-20 08:49:13 +00:00
..
compat/opensolaris
contrib/opensolaris	fix up r354804, resolve merge conflicts in zpool.8	2019-11-20 08:49:13 +00:00
lib	MFV r354378,r354379,r354386: 10499 Multi-modifier protection (MMP)	2019-11-18 09:38:35 +00:00
sbin	pkgbase: Force zfs(8) and zpool(8) to be in the runtime package	2019-09-05 14:07:49 +00:00
tests
usr.bin	fix up r354804, link zstreamdump with libzfs	2019-11-18 10:34:27 +00:00
usr.sbin	DTrace: add a top level makefile to the new test suit	2019-06-09 22:45:07 +00:00
Makefile
Makefile.inc