[illumos-gate merge]

commit 4fbfc69b99ccacf0999510e626df37e53b3d56ef
    10991 Allow user ACE in ACL to match SID in token extra SIDs
commit 10a268c1c2abd3fd9cc708870a3020567adeb92c
    11067 debug statistics crash ld(1) when -z allextract
commit 0bc0887e1cf0f912077b83256f295ad0ed1c715c
    11057 hidden undefined weak symbols should not leave relocations
    11058 libld entrance descriptor assertions get NDEBUG check backwards
commit b3b3563308068a7fafd98cf3021c73aedc1caa6c
    11060 sys/zone.h exposes more than it should
commit 810e978011ea80127b0a15368276459b566a3241
    10989 Ricoh scanner error after DFS get referral
commit a1096253735019dce07e79caf2df1e13078770fb
    10988 SMB should not create in directories marked delete-on-close
commit b5b772b09624dfff0e83299d0f7b895129f7bf26
    8583 Windows 10 fails to delete read-only files with SMB2
commit 575d359d36700f4571e4a87c94966a99b8b7f48a
    10987 SMB1 fails renaming an open file
commit 91ca6bffd299a6eb6fd63dd0ef807bbd6fb4f835
    10985 Hitting file handler count limit of 16k
commit e4c795beb33bf59dd4ad2e3f88f493111484b890
    10952 defer new resilvers and misc. resilver-related fixes
commit 1b55eab738595803f2f751ac1714f659b2e48b9b
    11062 psrinfo: comparison between pointer and integer
commit 80bd8a585c4ef2f19c09c9c4379635e411c91fe6
    11063 acl_common.c: error: comparison between pointer and integer
commit 84ce06cea75304aa6dec12e94975d5372dd9c672
    11072 Deadlock in lofi after 11043

	Conflicts:
	usr/src/uts/common/sys/zone.h

3 files changed, 8 insertions, 4 deletions

diff --git a/usr/src/common/acl/acl_common.c b/usr/src/common/acl/acl_common.c
index eb4fca808e..765d6cef12 100644
--- a/usr/src/common/acl/acl_common.c
+++ b/usr/src/common/acl/acl_common.c
@@ -1636,7 +1636,7 @@ acl_trivial_access_masks(mode_t mode, boolean_t isdir, trivial_acl_t *masks)
 int
 acl_trivial_create(mode_t mode, boolean_t isdir, ace_t **acl, int *count)
 {
-	int 		index = 0;
+	int		index = 0;
 	int		error;
 	trivial_acl_t	masks;
 
@@ -1696,7 +1696,7 @@ ace_trivial_common(void *acep, int aclcnt,
 	uint64_t cookie = 0;
 
 	while ((cookie = walk(acep, cookie, aclcnt, &flags, &type, &mask))
-	    != NULL) {
+	    != 0) {
 		switch (flags & ACE_TYPE_FLAGS) {
 		case ACE_OWNER:
 		case ACE_GROUP|ACE_IDENTIFIER_GROUP:
diff --git a/usr/src/common/zfs/zfeature_common.c b/usr/src/common/zfs/zfeature_common.c
index 1f1f55292d..feab5145c0 100644
--- a/usr/src/common/zfs/zfeature_common.c
+++ b/usr/src/common/zfs/zfeature_common.c
@@ -315,10 +315,13 @@ zpool_feature_init(void)
 	    "freed or remapped.",
 	    ZFEATURE_FLAG_READONLY_COMPAT, obsolete_counts_deps);
 
-	{
 	zfeature_register(SPA_FEATURE_ALLOCATION_CLASSES,
 	    "org.zfsonlinux:allocation_classes", "allocation_classes",
 	    "Support for separate allocation classes.",
 	    ZFEATURE_FLAG_READONLY_COMPAT, NULL);
-	}
+
+	zfeature_register(SPA_FEATURE_RESILVER_DEFER,
+	    "com.datto:resilver_defer", "resilver_defer",
+	    "Support for defering new resilvers when one is already running.",
+	    ZFEATURE_FLAG_READONLY_COMPAT, NULL);
 }
diff --git a/usr/src/common/zfs/zfeature_common.h b/usr/src/common/zfs/zfeature_common.h
index af29560ae9..ebe9626caf 100644
--- a/usr/src/common/zfs/zfeature_common.h
+++ b/usr/src/common/zfs/zfeature_common.h
@@ -63,6 +63,7 @@ typedef enum spa_feature {
 	SPA_FEATURE_POOL_CHECKPOINT,
 	SPA_FEATURE_SPACEMAP_V2,
 	SPA_FEATURE_ALLOCATION_CLASSES,
+	SPA_FEATURE_RESILVER_DEFER,
 	SPA_FEATURES
 } spa_feature_t;