import from illumos-nexenta
1884358344efb3a5958504efd8ef9949a80d1d6a
7aa236e38fef52de244b3b8b2e323cd6d7aadb53
ed00677f18a7543fb2b3a67e9d0c38cf7cb1fdc5
75c7a269f545c9ddd0d8a8aac5a6ecbe63f2b1d0
018d3f06fe63d3b8316ef73502fb8f2dd473ffd1
ab642d0b21105902f2434a96d212cfc6c9ebd9d3

--HG--
branch : dilos
extra : transplant_source : %D0%FD%7CT%98%A6%0F%2A%0EE%1Fu%CD%10%F0%13N8C%BC

Conflicts:
	usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
	usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h
import from illumos-nexenta
e6108728be436e0fe2b3b2c257b28f85d5d42fce

--HG--
branch : dilos
extra : transplant_source : t%3F%27%8E%DC%B9%5E.%B9V5%DC%EB%20lN%E9H%FF%9F
import from illumos-nexenta
404f9be523e714f37d2322ae8ab66f619d4a4b81

--HG--
branch : dilos
extra : transplant_source : %D0m%8C%D0JV%06%F2S%06e%B2V%2Cu0.%BFF%AF
import slow-io-de from illumos-nexenta
94a046f61fca51c315656a6900bceda28a61b375
4760610181fc9393d0d4e2829af5ee777f0cd8e6
f8e1764cca63df605bcb2b79108915b15b9b71c7 - part for slow-io-de
83d5a7a139462c11942dacbfc54feefa0d9201c2
a1a84bcccf35e7d7b76101ae5683794a15129ae2 - part for slow-io-de
17329b7940b3d6c8c451d9255358fa54dc6de052

--HG--
branch : dilos
extra : transplant_source : N%7B%84%B9%D7b%1C%3E%D7%7E%D4%14p%D1%E5%C8%23%EFU%AB

Conflicts:
	usr/src/uts/common/sys/scsi/targets/sddef.h
import from illumos-nexenta
6589e99190992f97aed4f4be79e7c415fd752e2c
add additional Makefile updates

--HG--
branch : dilos
extra : transplant_source : %E0OT%FCyUw%8E%C1K%00%D8Z%1D%D2%C2%B7%C7%C3%21
import from illumos-nexenta
3c2dc2b1733598e38777b0b3920a56d322b9067f
88852b476f1ff36ff50bd61fcac6147bf9bf6854

--HG--
branch : dilos
extra : transplant_source : %14%BBo%3D%5C%03%F1%C2%EF9%0B%A4%B2%EE%E5%FD%A6%F2%E0y
import from illumos-nexenta
ddd5b025b2105fed195a02c5f0d09f6e6b5162eb

--HG--
branch : dilos
extra : transplant_source : %E4%01%08%CF%D3F%08%0D%D4n%AF%FB%AB%CB%00%AD%C1dX%16
import from illumos-nexenta
3e80de848532fa09ce2d6b3c6f96f8b07e39f91c

--HG--
branch : dilos
extra : transplant_source : e%D6%BD%2C%EEc%FF4%E9%E6%B4%AB2%D02%7C%A8%26%92B
import from illumos-nexenta
6e0f8331b8ec6d087ca6714d0b4e23824d1301d6
824ab5020dc3d86898ef723a4bc75747a40bc51d

--HG--
branch : dilos
extra : transplant_source : g%E1%EA%CFgB%04%3A%EB%20%D9%CD%AA%08%ECc%08%DEQD
import from illumos-nexenta
c009e671716072ec99bfb2b89f8ee6a168686625

--HG--
branch : dilos
extra : transplant_source : e%07%B6%A4L%13%05%9B%83%E8zVpQM%098%D8d_
import from illumos-nexenta
d33e2882a128429e2d7c30b02fe281be1e203edd

--HG--
branch : dilos
extra : transplant_source : %BCj%CB%F8%DA%FEu%27g%15m%E5%E8%D5%D8%C4wCC%FD
import from illumos-nexenta
9ab33a015eacecc84395dfdabfa599deed1ab864

--HG--
branch : dilos
extra : transplant_source : %24%89%CB%AEp%A0_%0A%20B%B2%BF%D2%9F%9Es%0D%C4%CC%17
import disk-sense-de form illumos-nexenta
f8e1764cca63df605bcb2b79108915b15b9b71c7 - part for disk-sense-de
225b3a74326037db3529fceb320aaa50ccec8ee2
dcbd02e04988b7915b905fab9e3d091f7b0d4b62
ed226bf6a74a47e590d5793a7b8817352a8408e4
a1a84bcccf35e7d7b76101ae5683794a15129ae2 - part for disk-sense-de
668cafa49c8f6bba180b23cbce281f12ba45e9b1

--HG--
branch : dilos
extra : transplant_source : %3F%81%94d%92%5E%9DbY%0EE%D9%B6%1B%A8f%5D%F4%13o

 Changes to be committed:
	modified:   usr/src/cmd/fm/dicts/DISK.dict
	modified:   usr/src/cmd/fm/dicts/DISK.po
	modified:   usr/src/cmd/fm/modules/common/Makefile
	new file:   usr/src/cmd/fm/modules/common/disk-sense-de/Makefile
	new file:   usr/src/cmd/fm/modules/common/disk-sense-de/disk-sense-de.c
	new file:   usr/src/cmd/fm/modules/common/disk-sense-de/disk-sense-de.conf
	modified:   usr/src/cmd/fm/modules/common/disk-transport/disk_transport.c
	modified:   usr/src/pkg/manifests/service-fault-management.mf
	modified:   usr/src/uts/common/io/scsi/targets/sd.c
import from illumos-nexenta
7b389a501ee0b0220ca69ba89898f9b28d8ea276

--HG--
branch : dilos
extra : transplant_source : %AF%CA%CD%3Fp%C6%90%9B5%13%2A%09%28%C5%2C%7D%92%CCsP

 Changes to be committed:
	modified:   usr/src/uts/common/io/scsi/targets/sd.c
import from illumos-nexenta
ba2ffb047ac03d0345c192b99954d9cac48126fc

--HG--
branch : dilos
extra : transplant_source : %D3%8C%C7%B5%04%0E%AAms%AB%80q%3A2%0E%9C%85%9B%81%80

 Changes to be committed:
	modified:   usr/src/uts/common/io/scsi/targets/sd.c
	modified:   usr/src/uts/common/os/devcfg.c
import diskfltinj from illumos-nexenta
e390055979a13e5ecad03502c2d1092446c0ae00
49c2bfeb8c70c87bd2d1fc88c7cd89afa05e5718

--HG--
branch : dilos
extra : transplant_source : %7E%5C%C5a%F3%84%16%E3%BE%D7%29%86%12%DB%0E%24%5D%89%3C%F6

Conflicts:
	usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c

 Changes to be committed:
	modified:   usr/src/cmd/Makefile
	new file:   usr/src/cmd/diskfltinj/Makefile
	new file:   usr/src/cmd/diskfltinj/diskfltinj.c
	modified:   usr/src/pkg/manifests/SUNWcs.mf
	modified:   usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
	modified:   usr/src/uts/common/io/scsi/targets/sd.c
	modified:   usr/src/uts/common/sys/scsi/adapters/mpt_sas/mptsas_var.h
	modified:   usr/src/uts/common/sys/scsi/scsi_pkt.h
	modified:   usr/src/uts/common/sys/scsi/targets/sddef.h
import from illumos-nexenta
2389c109516f79e276479ecd1ec1de2ff3a5c462

--HG--
branch : dilos
extra : transplant_source : %84%EA%1AS%22%16%81y%5C%7D%29%C6%A0IY%99%E6%CC%06%A7

 Changes to be committed:
	modified:   usr/src/uts/common/io/scsi/targets/sd.c
import from illumos-nexenta
e6a477c5994264bfd6478f6ad08eb62c9e0c720b

--HG--
branch : dilos
extra : transplant_source : %A6%84%D6%1C%C4%93%E6%85%B5%3A%7Fw%C7%93%E1%FB%8A%B2L%25

 Changes to be committed:
	modified:   usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c
import from illumos-nexenta
6b7e62541640a598d9387dfe8c2a30fa69bbf40f

--HG--
branch : dilos
extra : transplant_source : %F7%1Dr%E2%E6%9F%ABU6%8A%91Tt%01%D2%81e%AF%7E%91

 Changes to be committed:
	modified:   usr/src/uts/common/os/modctl.c
	modified:   usr/src/uts/common/sys/sysevent/eventdefs.h
fix incorrect merge

 Changes to be committed:
	modified:   usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c