diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-24 13:13:08 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-06-24 13:13:08 +0000 |
| commit | 981376523286ca1b5e8013bd974546dac7cf4602 (patch) | |
| tree | b9c7e14ba10808d5fce59040e58584acc953149e /usr/src/uts | |
| parent | c6ce7a25abbb33fa38edd55230b7992c5a36ce91 (diff) | |
| parent | f2dbfd322ec9cd157a6e2cd8a53569e718a4b0af (diff) | |
| download | illumos-joyent-981376523286ca1b5e8013bd974546dac7cf4602.tar.gz | |
[illumos-gate merge]
commit f2dbfd322ec9cd157a6e2cd8a53569e718a4b0af
11184 Want CPU Temperature Sensors
11185 i86pc chip module should be smatch clean
commit 6ec1c6665dfa54c991783acaf82f51a97aa79267
11105 scsi_hba_tgtmap_create(9F) tgtmapout argument is incorrect
commit b73ccab03ec36581b1ae5945ef1fee1d06c79ccf
9318 vol_volsize_to_reservation does not account for raidz skip blocks
commit 29d33d4278d4226572dfc214775224334bc444a6
11260 mdb zfs metaslab statistics are unavailable
commit c1d5c2a48971d1705730e1ade6a1bc4d56587416
11084 clean up file-backed l2arc support
commit ba6bf04be4fe9d821c75a16fdebd3af3bffdbf26
11254 usb_parse_data.9f: WARNING: skipping paragraph macro: PP after SH
commit cec8643b41ebefad6c677010fc784dc4bb0550f3
11190 Update mandoc to 1.14.5
commit 07188943efdbeedd24142a14db7384af1478ba54
11264 tid::errno would be handy in mdb
Conflicts:
usr/src/uts/intel/sys/x86_archext.h
usr/src/uts/intel/Makefile.intel
usr/src/uts/intel/Makefile.files
usr/src/uts/i86pc/os/cpuid.c
usr/src/uts/common/sys/sunddi.h
usr/src/lib/fm/topo/modules/i86pc/chip/Makefile
usr/src/lib/fm/topo/modules/common/shared/topo_sensor.c
Diffstat (limited to 'usr/src/uts')
| -rw-r--r-- | usr/src/uts/common/sys/sunddi.h | 2 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/os/cpuid.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/intel/Makefile.files | 2 | ||||
| -rw-r--r-- | usr/src/uts/intel/Makefile.intel | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/common/sys/sunddi.h b/usr/src/uts/common/sys/sunddi.h index 8ce8508114..596084f253 100644 --- a/usr/src/uts/common/sys/sunddi.h +++ b/usr/src/uts/common/sys/sunddi.h @@ -24,7 +24,7 @@ * Copyright 2012 Garrett D'Amore <garrett@damore.org>. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. * Copyright 2016 Nexenta Systems, Inc. All rights reserved. - * Copyright 2019 Joyent, Inc. + * Copyright 2019, Joyent, Inc. */ #ifndef _SYS_SUNDDI_H diff --git a/usr/src/uts/i86pc/os/cpuid.c b/usr/src/uts/i86pc/os/cpuid.c index f53ec818d2..40d5586c08 100644 --- a/usr/src/uts/i86pc/os/cpuid.c +++ b/usr/src/uts/i86pc/os/cpuid.c @@ -1038,7 +1038,7 @@ static char *x86_feature_names[NUM_X86_FEATURES] = { "tbm", "avx512_vnni", "amd_pcec", - "md_clear", + "mb_clear", "mds_no", "core_thermal", "pkg_thermal" diff --git a/usr/src/uts/intel/Makefile.files b/usr/src/uts/intel/Makefile.files index bd10d299d7..54626b8222 100644 --- a/usr/src/uts/intel/Makefile.files +++ b/usr/src/uts/intel/Makefile.files @@ -21,7 +21,7 @@ # # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright 2019 Joyent, Inc. +# Copyright 2019, Joyent, Inc. # Copyright 2018 Nexenta Systems, Inc. # diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel index 5494ae8a30..6dd7be2287 100644 --- a/usr/src/uts/intel/Makefile.intel +++ b/usr/src/uts/intel/Makefile.intel @@ -21,7 +21,7 @@ # # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2013 Andrew Stormont. All rights reserved. -# Copyright 2019 Joyent, Inc. +# Copyright 2019, Joyent, Inc. # Copyright 2016 Garrett D'Amore <garrett@damore.org> # Copyright 2018 Nexenta Systems, Inc. # |