4112 sd should apply sd_io_time tunable to non-optical devices
4113 sd.conf tunable enhancements
Reviewed by: Garrett D'Amore <garrett@dey-sys.com>
Approved by: Albert Lee <trisk@nexenta.com>
3357 Desire -Q to make zlogin "quieter"
Reviewed by: David Höppner <0xffea@gmail.com>
Reviewed by: Andy Stormont <AStormont@racktopsystems.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
4086 readonly option for lofiadm(1m)
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Approved by: Robert Mustacchi <rm@joyent.com>
	[illumos-gate merge]

commit c2589d1319a6171334739fb4b10ddc8317ec486b
    3357 Desire -Q to make zlogin "quieter"
	[illumos-gate merge]

commit cd69fabe0332d2cf0e51b2cb6597286e0abcf6be
    4086 readonly option for lofiadm(1m)

	Conflict: usr/src/cmd/lofiadm/main.c (OS-20)
OS-2523 Provisioning failure due to incorrect permissions on zone root
4158 want getifaddrs manual page
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
3830 SIGQUEUE_MAX's limit of 32 is too low
Reviewed by: Cedric Blancher <cedric.blancher@gmail.com>
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Reviewed by: Irek Szczesniak <iszczesniak@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
3881 want device driver for HP SmartArray RAID controllers
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Eric Sproul <esproul@omniti.com>
Reviewed by: ken mays <maybird1776@yahoo.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Garrett D'Amore <garrett.damore@gmail.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
4091 e1000g I217/I218 support
4092 Intel 1GBe NIC common code should be shared
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
4090 igb I210/I211 support
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
	[illumos-gate merge]

commit 6ed0a5cff079e25f4aa15cef67c6dd48ee60b018
    4090 igb I210/I211 support
commit 75eba5b6d79ed4d2ce3daf7b2806306b6b69a938
    4091 e1000g I217/I218 support
    4092 Intel 1GBe NIC common code should be shared
commit 80c94ecd7a524eb933a4bb221a9618b9dc490e76
    3881 want device driver for HP SmartArray RAID controllers
commit 5e989a96186a37eb528fb7bb4d28a150874ec799
    3830 SIGQUEUE_MAX's limit of 32 is too low
commit b9476f453004695da12eaaff383ed9005e7a47c4
    4158 want getifaddrs manual page

Conflicts:
	usr/src/man/man5/resource_controls.5
	usr/src/man/man7d/cpqary3.7d
	usr/src/pkg/manifests/driver-storage-cpqary3.mf
	usr/src/uts/common/io/cpqary3/cpqary3.c
	usr/src/uts/common/Makefile.files
	usr/src/uts/intel/cpqary3/Makefile

Manifests:
	usr/src/pkg/manifests/driver-network-e1000g.mf
	usr/src/pkg/manifests/driver-network-igb.mf
4016 disk-monitor should activate fault/fail indicators
4017 fmtopo -P flag does not appear to set properties
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Approved by: Albert Lee <trisk@nexenta.com>
4018 mpt_sas: allow physical topology enumeration in libtopo
4019 mpt_sas: expose LED controls to libtopo
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
Reviewed by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Albert Lee <trisk@nexenta.com>
OS-2495 add support for multiple mac addresses per client
	[illumos-gate merge]

commit aed5247ff899ec457005d93dfbdb4ffd74574695
    4018 mpt_sas: allow physical topology enumeration in libtopo
    4019 mpt_sas: expose LED controls to libtopo
commit 1410cb930a3e26032c59c6835837a28c47366b3c
    4016 disk-monitor should activate fault/fail indicators
    4017 fmtopo -P flag does not appear to set properties

Conflicts:
	usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c (new content)
	usr/src/lib/fm/topo/modules/common/fac_prov_mptsas/fac_prov_mptsas.c (OS-2444)
	usr/src/lib/fm/topo/modules/common/disk/disk_mptsas.c (OS-2444)
	usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-1101/Joyent-Compute-Platform-1101-disk-hc-topology.xmlgenksh (OS-2444)
	usr/src/cmd/fm/modules/common/disk-lights/disk_lights.c (lint)
	usr/src/cmd/fm/modules/common/disk-lights/Makefile (lint)
OS-2452 v8.so crashes with core dump
4101 metaslab_debug should allow for fine-grained control
4102 space_maps should store more information about themselves
4103 space map object blocksize should be increased
4104 ::spa_space no longer works
4105 removing a mirrored log device results in a leaked object
4106 asynchronously load metaslab
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Sebastien Roy <seb@delphix.com>
Approved by: Garrett D'Amore <garrett@damore.org>
	[illumos-gate merge]

commit 0713e232b7712cd27d99e1e935ebb8d5de61c57d
    4101 metaslab_debug should allow for fine-grained control
    4102 space_maps should store more information about themselves
    4103 space map object blocksize should be increased
    4104 ::spa_space no longer works
    4105 removing a mirrored log device results in a leaked object
    4106 asynchronously load metaslab

Conflicts:
	usr/src/man/man5/zpool-features.5
Merge branch 'master' of git://github.com/joyent/illumos-joyent into smartos/ec