[illumos-gate merge]

commit 15276eb5b5c891978242f14352c27676ed336244
    13704 add Ice Lake Xeon to PPIN list
    13705 add recent Intel models to x86_archext.h
commit 6dcbfae4aa2c2aab7ebd7174bd2f0232528126b7
    13201 IPS image re-hydration fails
commit 8222814ef8560ee0ba222eca8ca5acffc6cd0e44
    13487 want mapfile-based assertions about symbol properties
commit 99ea293e719ac006d413e4fde6ac0d5cd4dd6c59
    7668 zfs get only outputs 3 columns if "clones" property is empty

Conflicts:
    usr/src/lib/libzfs/common/mapfile-vers

1 files changed, 75 insertions, 65 deletions

diff --git a/usr/src/lib/libnvpair/mapfile-vers b/usr/src/lib/libnvpair/mapfile-vers
index 9b1f048f75..5754fd1715 100644
--- a/usr/src/lib/libnvpair/mapfile-vers
+++ b/usr/src/lib/libnvpair/mapfile-vers
@@ -42,69 +42,69 @@ $mapfile_version 2
 
 SYMBOL_VERSION ILLUMOS_0.1 {	# Illumos additions
     global:
-    fnvlist_alloc;
-    fnvlist_free;
-    fnvlist_size;
-    fnvlist_pack;
-    fnvlist_pack_free;
-    fnvlist_unpack;
-    fnvlist_dup;
-    fnvlist_merge;
-    fnvlist_num_pairs;
-    fnvlist_add_boolean;
-    fnvlist_add_boolean_value;
-    fnvlist_add_byte;
-    fnvlist_add_int8;
-    fnvlist_add_uint8;
-    fnvlist_add_int16;
-    fnvlist_add_uint16;
-    fnvlist_add_int32;
-    fnvlist_add_uint32;
-    fnvlist_add_int64;
-    fnvlist_add_uint64;
-    fnvlist_add_string;
-    fnvlist_add_nvlist;
-    fnvlist_add_nvpair;
-    fnvlist_add_boolean_array;
-    fnvlist_add_byte_array;
-    fnvlist_add_int8_array;
-    fnvlist_add_uint8_array;
-    fnvlist_add_int16_array;
-    fnvlist_add_uint16_array;
-    fnvlist_add_int32_array;
-    fnvlist_add_uint32_array;
-    fnvlist_add_int64_array;
-    fnvlist_add_uint64_array;
-    fnvlist_add_string_array;
-    fnvlist_add_nvlist_array;
-    fnvlist_remove;
-    fnvlist_remove_nvpair;
-    fnvlist_lookup_nvpair;
-    fnvlist_lookup_boolean;
-    fnvlist_lookup_boolean_value;
-    fnvlist_lookup_byte;
-    fnvlist_lookup_int8;
-    fnvlist_lookup_int16;
-    fnvlist_lookup_int32;
-    fnvlist_lookup_int64;
-    fnvlist_lookup_uint8_t;
-    fnvlist_lookup_uint16;
-    fnvlist_lookup_uint32;
-    fnvlist_lookup_uint64;
-    fnvlist_lookup_string;
-    fnvlist_lookup_nvlist;
-    fnvpair_value_boolean_value;
-    fnvpair_value_byte;
-    fnvpair_value_int8;
-    fnvpair_value_int16;
-    fnvpair_value_int32;
-    fnvpair_value_int64;
-    fnvpair_value_uint8_t;
-    fnvpair_value_uint16;
-    fnvpair_value_uint32;
-    fnvpair_value_uint64;
-    fnvpair_value_string;
-    fnvpair_value_nvlist;
+	fnvlist_alloc;
+	fnvlist_free;
+	fnvlist_size;
+	fnvlist_pack;
+	fnvlist_pack_free;
+	fnvlist_unpack;
+	fnvlist_dup;
+	fnvlist_merge;
+	fnvlist_num_pairs;
+	fnvlist_add_boolean;
+	fnvlist_add_boolean_value;
+	fnvlist_add_byte;
+	fnvlist_add_int8;
+	fnvlist_add_uint8;
+	fnvlist_add_int16;
+	fnvlist_add_uint16;
+	fnvlist_add_int32;
+	fnvlist_add_uint32;
+	fnvlist_add_int64;
+	fnvlist_add_uint64;
+	fnvlist_add_string;
+	fnvlist_add_nvlist;
+	fnvlist_add_nvpair;
+	fnvlist_add_boolean_array;
+	fnvlist_add_byte_array;
+	fnvlist_add_int8_array;
+	fnvlist_add_uint8_array;
+	fnvlist_add_int16_array;
+	fnvlist_add_uint16_array;
+	fnvlist_add_int32_array;
+	fnvlist_add_uint32_array;
+	fnvlist_add_int64_array;
+	fnvlist_add_uint64_array;
+	fnvlist_add_string_array;
+	fnvlist_add_nvlist_array;
+	fnvlist_remove;
+	fnvlist_remove_nvpair;
+	fnvlist_lookup_nvpair;
+	fnvlist_lookup_boolean;
+	fnvlist_lookup_boolean_value;
+	fnvlist_lookup_byte;
+	fnvlist_lookup_int8;
+	fnvlist_lookup_int16;
+	fnvlist_lookup_int32;
+	fnvlist_lookup_int64;
+	fnvlist_lookup_uint8_t;
+	fnvlist_lookup_uint16;
+	fnvlist_lookup_uint32;
+	fnvlist_lookup_uint64;
+	fnvlist_lookup_string;
+	fnvlist_lookup_nvlist;
+	fnvpair_value_boolean_value;
+	fnvpair_value_byte;
+	fnvpair_value_int8;
+	fnvpair_value_int16;
+	fnvpair_value_int32;
+	fnvpair_value_int64;
+	fnvpair_value_uint8_t;
+	fnvpair_value_uint16;
+	fnvpair_value_uint32;
+	fnvpair_value_uint64;
+	fnvpair_value_string;
+	fnvpair_value_nvlist;
 } SUNW_1.3;
 
 
@@ -133,9 +133,19 @@ SYMBOL_VERSION SUNW_1.2 {
     global:
 	nv_alloc_fini;
 	nv_alloc_init;
-	nv_alloc_nosleep;
+	nv_alloc_nosleep	{
+				  ASSERT = {
+					  TYPE = OBJECT;
+					  SIZE = addrsize;
+					};
+				};
 	nv_alloc_reset;
-	nv_fixed_ops;
+	nv_fixed_ops		{
+				  ASSERT = {
+					  TYPE = OBJECT;
+					  SIZE = addrsize;
+					};
+				};
 	nvlist_add_boolean_array;
 	nvlist_add_boolean_value;
 	nvlist_add_int8;