[illumos-gate merge]

commit a99cb9618990662acbd3bab1b4a5b05a6ca62556
    11531 tools/make should set NATIVE_CCFLAGS
commit 7e6ac63905653744ac6703d7bc31790c363cf5e7
    11539 dboot: build errors with gcc9
commit 889229bb296dd6f2b73fa6bb3247c58a71282836
    4705 fork(2): See "MT-Level of Libraries"
commit a3bfe1dcd8a83b2661def9170b5005a830e8780d
    11497 ddi_device_acc_attr(9S) has the wrong version number
commit 634942f535e93dad348fa175c9bc116e7bf936ba
    11582 3SCF isn't the object-caching memory allocation library
commit 356ba08c15b26adbde3440aa89d8b31cd39fc526
    11533 tools/make: gcc9 build errors
    11534 tools/make: remove sys_nerr
    11535 tools/make: amd64 arch is not supported
    11536 tools/make: getmem() should take size_t
commit 21c878fe36c0151617d2f009615f5d18fddb207e
    11559 zfs: device removal should not block bootability
commit 6af23589e78469fc9f90db8558854d1a822aaa72
    10623 ZFS should be more aggressive in updating vdev devid
commit 0f2f3e995cde8dabd9edf8bb05b957a50bc7cc20
    11517 loader.efi: efipart should be more careful about constructing block device lists
commit a9370e9f996b7ce61bb1a9612a0625161a922320
    9096 passwords (policy.conf) should default to sha512
commit f67950b21e185934ccabe311516f4dcbdb00ef79
    11479 zfs project support

1 files changed, 64 insertions, 1 deletions

diff --git a/usr/src/man/man5/zpool-features.5 b/usr/src/man/man5/zpool-features.5
index 88efb3d543..21a5369799 100644
--- a/usr/src/man/man5/zpool-features.5
+++ b/usr/src/man/man5/zpool-features.5
@@ -708,7 +708,7 @@ vdevs from an allocation class are removed.
 .sp
 .ne 2
 .na
-\fB\fBcom.datto:encryption\fR\fR
+\fB\fBencryption\fR\fR
 .ad
 .RS 4n
 .TS
@@ -744,6 +744,69 @@ running one to be immediately restarted from the beginning.
 
 This feature becomes \fBactive\fR once a resilver has been deferred, and
 returns to being \fBenabled\fR when the deferred resilver begins.
+.RE
+
+.sp
+.ne 2
+.na
+\fBuserobj_accounting\fR
+.ad
+.RS 4n
+.TS
+l l .
+GUID	org.zfsonlinux:userobj_accounting
+READ\-ONLY COMPATIBLE	yes
+DEPENDENCIES	extensible_dataset
+.TE
+
+This feature allows administrators to account the object usage information
+by user and group.
+
+This feature becomes \fBactive\fR as soon as it is enabled and will never
+return to being \fBenabled\fR.
+Each filesystem will be upgraded automatically when remounted, or when new
+files are created under that filesystem.
+The upgrade can also be started manually on filesystems by running
+`zfs set version=current <pool/fs>`.
+The upgrade process runs in the background and may take a while to complete
+for filesystems containing a large number of files.
+.RE
+
+.sp
+.ne 2
+.na
+\fBproject_quota\fR
+.ad
+.RS 4n
+.TS
+l l .
+GUID	org.zfsonlinux:project_quota
+READ\-ONLY COMPATIBLE	yes
+DEPENDENCIES	extensible_dataset
+.TE
+
+This feature allows administrators to account the space and object usage
+information against the project identifier (ID).
+
+The project ID is a new object-based attribute.
+When upgrading an existing filesystem, an object without a project ID
+attribute will be assigned a zero project ID.
+After this feature is enabled, a newly created object will inherit
+its parent directory's project ID if the parent's inherit flag is set (via
+\fBzfs project [-s|-C]\fR).
+Otherwise, the new object's project ID will be set as zero.
+An object's project ID can be changed at any time by the owner (or privileged
+user) via \fBzfs project -p $prjid\fR.
+
+This feature will become \fBactive\fR as soon as it is enabled and will never
+return to being \fBdisabled\fR.
+Each filesystem will be upgraded automatically when remounted or when a new file
+is created under that filesystem.
+The upgrade can also be triggered on filesystems via `zfs set version=current
+<pool/fs>`.
+The upgrade process runs in the background and may take a while to complete
+for the filesystems containing a large number of files.
+.RE
 
 .SH "SEE ALSO"
 \fBzfs\fR(1M), \fBzpool\fR(1M)