Refresh

diff --cc zfs/lib/libzfs/libzfs_changelist.c
Simple merge

diff --cc zfs/lib/libzfs/libzfs_dataset.c
Simple merge

diff --cc zfs/lib/libzpool/spa.c
Simple merge

diff --cc zfs/lib/libzpool/vdev_label.c
Simple merge

diff --cc zfs/lib/libzpool/zfs_ioctl.c
index 9c9dab5e91fff88dd6eeb0fe709bd35ae2fdb593,b6ad57451e6b4cb84754854182c2cf859785be44..42189db8fb1f28508970b2124cd419aa7190081d
--- 1/zfs/lib/libdmu-ctl/zfs_ioctl.c
--- 2/zfs/lib/libzpool/zfs_ioctl.c
+++ b/zfs/lib/libzpool/zfs_ioctl.c
@@@ -1417,14 -1460,18 +1462,20 @@@ zfs_set_prop_nvlist(const char *name, n
                        break;
  
                case ZFS_PROP_SHARESMB:
-                       if (zpl_check_version(name, ZPL_VERSION_FUID))
+                       if (zpl_earlier_version(name, ZPL_VERSION_FUID))
                                return (ENOTSUP);
                        break;
-               }
-               if ((error = zfs_secpolicy_setprop(name, prop, CRED())) != 0)
-                       return (error);
+ 
+               case ZFS_PROP_ACLINHERIT:
+                       if (nvpair_type(elem) == DATA_TYPE_UINT64 &&
+                           nvpair_value_uint64(elem, &intval) == 0)
+                               if (intval == ZFS_ACL_PASSTHROUGH_X &&
+                                   zfs_earlier_version(name,
+                                   SPA_VERSION_PASSTHROUGH_X))
+                                       return (ENOTSUP);
+               }
 +              default:
 +                      break;
        }
  
        elem = NULL;