diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-07-29 12:13:24 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-07-29 12:13:24 +0000 |
| commit | 17304c0b18b0ddd09fa2283f34a32b031338ff26 (patch) | |
| tree | e74f22b7bb16647b7e9da94d68bf69aae4e463f4 /usr/src/pkg/manifests/system-header.mf | |
| parent | 4114093726f400cc6f3a5e1fb3c934d55cdf5f66 (diff) | |
| parent | 5cffb2606ed604b9f1f45d061bc8aa92e0536f70 (diff) | |
| download | illumos-joyent-17304c0b18b0ddd09fa2283f34a32b031338ff26.tar.gz | |
[illumos-gate merge]
commit 5cffb2606ed604b9f1f45d061bc8aa92e0536f70
11306 syseventd cores after hot-add of disk
commit 508a0e8cf1600b06c1f7361ad76e736710d3fdf8
11257 Add DDI support for Upgradable Firmware Modules
11258 Add libtopo support for Upgradable Firmware Modules
Conflicts:
usr/src/uts/sparc/ufmtest/Makefile
usr/src/uts/sparc/Makefile.sparc
usr/src/uts/intel/ufmtest/Makefile
usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h
usr/src/uts/common/sys/ddi_ufm_impl.h
usr/src/uts/common/sys/ddi_ufm.h
usr/src/uts/common/io/ufmtest.c
usr/src/uts/common/io/ufm.c
usr/src/test/os-tests/tests/Makefile
usr/src/test/os-tests/runfiles/default.run
usr/src/man/man9f/ddi_ufm_image.9f
usr/src/man/man9f/Makefile
usr/src/man/man9e/ddi_ufm.9e
usr/src/man/man9e/Makefile
usr/src/man/man7d/ufm.7d
usr/src/lib/fm/topo/libtopo/common/topo_mod.c
Diffstat (limited to 'usr/src/pkg/manifests/system-header.mf')
| -rw-r--r-- | usr/src/pkg/manifests/system-header.mf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf index 494e5dd023..2f78c34031 100644 --- a/usr/src/pkg/manifests/system-header.mf +++ b/usr/src/pkg/manifests/system-header.mf @@ -900,6 +900,8 @@ file path=usr/include/sys/ddi_intr_impl.h file path=usr/include/sys/ddi_isa.h file path=usr/include/sys/ddi_obsolete.h file path=usr/include/sys/ddi_periodic.h +file path=usr/include/sys/ddi_ufm.h +file path=usr/include/sys/ddi_ufm_impl.h file path=usr/include/sys/ddidevmap.h file path=usr/include/sys/ddidmareq.h file path=usr/include/sys/ddifm.h |