[illumos-gate merge]

commit 07eb1aef88b873c5c1036d9cf69820c1ef6a32fb
    11151 libpkcs11: NULL pointer errors
commit c0e21d6af8bfe88f1c49c7c12d4537b663fe9db9
    11150 libdladm: NULL pointer errors
commit c8a3ee0e3658c32402e6bd505596d4fa45bfe17c
    11208 add mdb format character for jazzed-up binary output
    11206 mdb output autowrapping still subtly wrong
    11207 many 64-bit mdb format characters have insufficient width
commit b1e2e3fb17324e9ddf43db264a0c64da7756d9e6
    10936 umem_genasm needs to be stricter about segments
    10937 Clean up umem smatch and cerrwarn
commit 3c308cd1a430039e3b6327544d02ab1a5384066a
    11259 mandoc should allow ERRORS section in all man section 7 variants
commit 3970c09844d4f5e54234620de153ab71a05afbca
    11149 libpkg: NULL pointer errors
commit f00128d8e2d39a5be61357047531dc79fde48623
    11134 libdevinfo: NULL pointer errors
commit 4a014300cea3d870431d7e52aff6781d3c63e5d1
    11143 libscf: NULL pointer errors
commit d60ff33691519a9505afc8818735139f4dfd0c31
    11141 libdtrace: NULL pointer errors
commit 7c207486dba29784d04c67b7d1a97e8cff0a4ff9
    11139 libcpc: NULL pointer errors
commit ce67cb245e522293fca567799070a5cdd4267929
    11131 libtsol: NULL pointer errors
commit 559f8b540657be5e8d59b0b7017058a7ac6ba4bb
    11127 libsip: NULL pointer errors
commit f21450b8fa7a1530d48dc06401e691df1b8965fa
    11121 libadm: NULL pointer errors
commit 5f060f5100426465bddc18c6f81b146ccee30eb8
    11120 libpcidb: NULL pointer errors
commit 22ca2f96318fd461cfbcc23fd450623fe08610a3
    11109 librtld_db: NULL pointer errors
commit 6888a8ba15f151decee7821a09e34fed2fb63513
    11107 mcs: NULL pointer errors
commit 9320f4959b6c72e7a6d056623827091cace259ee
    11106 elfedit: NULL pointer errors
commit fb8f92baa78fdf1ddda6f49125fbd59366393ac8
    11101 libld: NULL pointer errors

	Conflicts:
	usr/src/lib/libumem/amd64/umem_genasm.c

1 files changed, 10 insertions, 10 deletions

diff --git a/usr/src/lib/libdladm/common/linkprop.c b/usr/src/lib/libdladm/common/linkprop.c
index 0afd4d8bce..703fca8d4e 100644
--- a/usr/src/lib/libdladm/common/linkprop.c
+++ b/usr/src/lib/libdladm/common/linkprop.c
@@ -71,7 +71,7 @@
 
 /*
  * The linkprop get() callback.
- * - pd: 	pointer to the prop_desc_t
+ * - pd:	pointer to the prop_desc_t
  * - propstrp:	a property string array to keep the returned property.
  *		Caller allocated.
  * - cntp:	number of returned properties.
@@ -88,7 +88,7 @@ typedef dladm_status_t	pd_getf_t(dladm_handle_t, prop_desc_t *pdp,
  * The linkprop set() callback.
  * - propval:	a val_desc_t array which keeps the property values to be set.
  * - cnt:	number of properties to be set.
- * - flags: 	additional flags passed down the system call.
+ * - flags:	additional flags passed down the system call.
  *
  * pd_set takes val_desc_t given by pd_check(), translates it into
  * a format suitable for kernel consumption. This may require allocation
@@ -416,8 +416,8 @@ static const bridge_public_prop_t bridge_prop[] = {
 };
 
 static  val_desc_t	link_duplex_vals[] = {
-	{ "half", 	LINK_DUPLEX_HALF	},
-	{ "full", 	LINK_DUPLEX_HALF	}
+	{ "half",	LINK_DUPLEX_HALF	},
+	{ "full",	LINK_DUPLEX_HALF	}
 };
 static  val_desc_t	link_status_vals[] = {
 	{ "up",		LINK_STATE_UP		},
@@ -2686,7 +2686,7 @@ check_allowedips(dladm_handle_t handle, prop_desc_t *pdp,
 fail:
 	for (i = 0; i < val_cnt; i++) {
 		free((void *)vdp[i].vd_val);
-		vdp[i].vd_val = NULL;
+		vdp[i].vd_val = 0;
 	}
 	return (status);
 }
@@ -3109,7 +3109,7 @@ check_allowedcids(dladm_handle_t handle, prop_desc_t *pdp,
 fail:
 	for (i = 0; i < val_cnt; i++) {
 		free((void *)vdp[i].vd_val);
-		vdp[i].vd_val = NULL;
+		vdp[i].vd_val = 0;
 	}
 	return (status);
 }
@@ -3177,7 +3177,7 @@ check_secondary_macs(dladm_handle_t handle, prop_desc_t *pdp,
 fail:
 	for (i = 0; i < val_cnt; i++) {
 		free((void *)vdp[i].vd_val);
-		vdp[i].vd_val = NULL;
+		vdp[i].vd_val = 0;
 	}
 	return (status);
 }
@@ -3476,7 +3476,7 @@ check_rate(dladm_handle_t handle, prop_desc_t *pdp, datalink_id_t linkid,
 	uint_t		modval_cnt = MAX_SUPPORT_RATES;
 	char		*buf, **modval;
 	dladm_status_t	status;
-	uint_t 		perm_flags;
+	uint_t		perm_flags;
 	uint_t		val_cnt = *val_cntp;
 	val_desc_t	*vdp = *vdpp;
 
@@ -4277,9 +4277,9 @@ i_dladm_set_private_prop(dladm_handle_t handle, datalink_id_t linkid,
     const char *prop_name, char **prop_val, uint_t val_cnt, uint_t flags)
 {
 	int		i, slen;
-	int 		bufsize = 0;
+	int		bufsize = 0;
 	dld_ioc_macprop_t *dip = NULL;
-	uchar_t 	*dp;
+	uchar_t		*dp;
 	link_attr_t *p;
 	dladm_status_t	status = DLADM_STATUS_OK;