summaryrefslogtreecommitdiff
path: root/manifest
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-06-24 13:13:08 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-06-24 13:13:08 +0000
commit981376523286ca1b5e8013bd974546dac7cf4602 (patch)
treeb9c7e14ba10808d5fce59040e58584acc953149e /manifest
parentc6ce7a25abbb33fa38edd55230b7992c5a36ce91 (diff)
parentf2dbfd322ec9cd157a6e2cd8a53569e718a4b0af (diff)
downloadillumos-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 'manifest')
-rw-r--r--manifest1
1 files changed, 1 insertions, 0 deletions
diff --git a/manifest b/manifest
index d3e35d87e0..10864d500a 100644
--- a/manifest
+++ b/manifest
@@ -4513,6 +4513,7 @@ f usr/include/sys/sem_impl.h 0644 root bin
f usr/include/sys/sema_impl.h 0644 root bin
f usr/include/sys/semaphore.h 0644 root bin
f usr/include/sys/sendfile.h 0644 root bin
+f usr/include/sys/sensors.h 0644 root bin
f usr/include/sys/ser_sync.h 0644 root bin
f usr/include/sys/serializer.h 0644 root bin
f usr/include/sys/session.h 0644 root bin