[illumos-gate merge]

commit d0972c645cf979856ed66c1c6a1f082383c90b0c
    12093 devid_scsi_encode() should use a static format string
commit 028b5df8ad1713f1c0c8ba060ec660fe0a20261d
    12095 Don't call sizeof on void
commit 2c4824dbe94f4768dd1a5058fc108fc83513cf59
    11977 pchtemp(7D) missing Whiskey Lake PCI ID

6 files changed, 17 insertions, 10 deletions

diff --git a/usr/src/common/devid/devid_scsi.c b/usr/src/common/devid/devid_scsi.c
index 0a97d15029..752bfea07f 100644
--- a/usr/src/common/devid/devid_scsi.c
+++ b/usr/src/common/devid/devid_scsi.c
@@ -25,6 +25,10 @@
  */
 
 /*
+ * Copyright 2019 Joyent, Inc.
+ */
+
+/*
  * These functions are used to encode SCSI INQUIRY data into
  * Solaris devid / guid values.
  */
@@ -232,7 +236,7 @@ devid_scsi_encode(
 				(void) strncat(msg, inq_std->inq_revision,
 				    sizeof (inq_std->inq_revision));
 				(void) strcat(msg, "\n");
-				cmn_err(CE_WARN, msg);
+				cmn_err(CE_WARN, "%s", msg);
 				kmem_free(msg,
 				    MSG_NOT_STANDARDS_COMPLIANT_SIZE);
 			}
@@ -301,7 +305,7 @@ static int
 is_page83_data_valid(uchar_t *inq83, size_t inq83_len)
 {
 
-	int 	covered_desc_len	= 0;
+	int	covered_desc_len	= 0;
 	int	dlen			= 0;
 	uchar_t	*dblk			= NULL;
 
@@ -1336,7 +1340,7 @@ scsi_wwnstr_hexcase(char *wwnstr, int upper_case_hex)
  * Function: scsi_wwnstr_skip_ua_prefix
  *
  * Description: This routine removes the leading 'w' in wwnstr,
- * 		if its in unit-address form.
+ *		if its in unit-address form.
  *
  * Arguments: wwnstr - the string wwn to be transformed
  *
diff --git a/usr/src/pkg/manifests/driver-cpu-sensor.mf b/usr/src/pkg/manifests/driver-cpu-sensor.mf
index b6b59e4f03..1540e5a8f2 100644
--- a/usr/src/pkg/manifests/driver-cpu-sensor.mf
+++ b/usr/src/pkg/manifests/driver-cpu-sensor.mf
@@ -38,6 +38,7 @@ driver name=pchtemp \
     alias=pci8086,8ca4,p \
     alias=pci8086,8d24,p \
     alias=pci8086,9d31,p \
+    alias=pci8086,9df9,p \
     alias=pci8086,a131,p \
     alias=pci8086,a1b1,p \
     alias=pci8086,a231,p \
diff --git a/usr/src/uts/common/fs/zfs/dsl_scan.c b/usr/src/uts/common/fs/zfs/dsl_scan.c
index 9d2b7a509c..81c7d599a4 100644
--- a/usr/src/uts/common/fs/zfs/dsl_scan.c
+++ b/usr/src/uts/common/fs/zfs/dsl_scan.c
@@ -1241,7 +1241,7 @@ dsl_scan_should_clear(dsl_scan_t *scn)
 		if (queue != NULL) {
 			/* # extents in exts_by_size = # in exts_by_addr */
 			mused += zfs_btree_numnodes(&queue->q_exts_by_size) *
-			    sizeof (range_seg_t) + queue->q_sio_memused;
+			    sizeof (range_seg_gap_t) + queue->q_sio_memused;
 		}
 		mutex_exit(&tvd->vdev_scan_io_queue_lock);
 	}
diff --git a/usr/src/uts/common/fs/zfs/sys/range_tree.h b/usr/src/uts/common/fs/zfs/sys/range_tree.h
index d80faa933e..6e0025a2f1 100644
--- a/usr/src/uts/common/fs/zfs/sys/range_tree.h
+++ b/usr/src/uts/common/fs/zfs/sys/range_tree.h
@@ -126,11 +126,11 @@ rs_get_start_raw(const range_seg_t *rs, const range_tree_t *rt)
 	ASSERT3U(rt->rt_type, <=, RANGE_SEG_NUM_TYPES);
 	switch (rt->rt_type) {
 	case RANGE_SEG32:
-		return (((range_seg32_t *)rs)->rs_start);
+		return (((const range_seg32_t *)rs)->rs_start);
 	case RANGE_SEG64:
-		return (((range_seg64_t *)rs)->rs_start);
+		return (((const range_seg64_t *)rs)->rs_start);
 	case RANGE_SEG_GAP:
-		return (((range_seg_gap_t *)rs)->rs_start);
+		return (((const range_seg_gap_t *)rs)->rs_start);
 	default:
 		VERIFY(0);
 		return (0);
@@ -143,11 +143,11 @@ rs_get_end_raw(const range_seg_t *rs, const range_tree_t *rt)
 	ASSERT3U(rt->rt_type, <=, RANGE_SEG_NUM_TYPES);
 	switch (rt->rt_type) {
 	case RANGE_SEG32:
-		return (((range_seg32_t *)rs)->rs_end);
+		return (((const range_seg32_t *)rs)->rs_end);
 	case RANGE_SEG64:
-		return (((range_seg64_t *)rs)->rs_end);
+		return (((const range_seg64_t *)rs)->rs_end);
 	case RANGE_SEG_GAP:
-		return (((range_seg_gap_t *)rs)->rs_end);
+		return (((const range_seg_gap_t *)rs)->rs_end);
 	default:
 		VERIFY(0);
 		return (0);
diff --git a/usr/src/uts/intel/io/pchtemp/pchtemp.c b/usr/src/uts/intel/io/pchtemp/pchtemp.c
index 2c2997c958..645de72727 100644
--- a/usr/src/uts/intel/io/pchtemp/pchtemp.c
+++ b/usr/src/uts/intel/io/pchtemp/pchtemp.c
@@ -39,6 +39,7 @@
  *  - Intel 100 Series PCH
  *  - Intel 200 Series and Z730 PCH
  *  - Intel Sunrise Point-LP (Kaby Lake-U) PCH
+ *  - Intel Cannon Lake (Whiskey Lake-U) PCH
  *  - Intel 300 Series and C240 Chipset
  *
  * The following chipsets use a different format and are not currently
diff --git a/usr/src/uts/intel/os/driver_aliases b/usr/src/uts/intel/os/driver_aliases
index 230c4232e5..b1aec02501 100644
--- a/usr/src/uts/intel/os/driver_aliases
+++ b/usr/src/uts/intel/os/driver_aliases
@@ -1203,6 +1203,7 @@ pchtemp "pci8086,8ca4,p"
 pchtemp "pci8086,8c24,p"
 pchtemp "pci8086,8d24,p"
 pchtemp "pci8086,9d31,p"
+pchtemp "pci8086,9df9,p"
 pchtemp "pci8086,a1b1,p"
 pchtemp "pci8086,a231,p"
 pchtemp "pci8086,a2b1,p"