Merge remote-tracking branch 'illumos-ml/master' into titanic

Some zev merge conflicts fixed.

Conflicts:
usr/src/uts/common/fs/zfs/zfs_ioctl.c
usr/src/uts/common/fs/zfs/zvol.c

4072 make clobber leaves trash
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Marcel Telka <marcel.telka@nexenta.com>
Reviewed by: Richard Low

4072 make clobber leaves trash
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Marcel Telka <marcel.telka@nexenta.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Garrett D'Amore <garrett@damore.org>

show more ...

PSARC 2008/485 SES Sensors and Enumerator
6720433 SES enumerator should provide controller revision information
6720435 SES enumerator should prefer description over class-description
6720452 SES enu

PSARC 2008/485 SES Sensors and Enumerator
6720433 SES enumerator should provide controller revision information
6720435 SES enumerator should prefer description over class-description
6720452 SES enumerator should support indicators and sensors
6722807 SES enumerator should work with internal enclosures
6722809 want a way to identify enclosures as internal
6722811 SES enumerator should prefer elements with known status
6723603 x86 xmlgen topo scripts should make use of propmap
6732875 typo in fan-hc-topology.xmlgen
6732879 broken logic in pad_process()

--HG--
rename : usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-M2/Sun-Fire-X4200-M2-hc-topology.xmlgen => usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-M2/Sun-Fire-X4200-M2-disk-hc-topology.xmlgen
rename : usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-Server/Sun-Fire-X4200-Server-hc-topology.xmlgen => usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4200-Server/Sun-Fire-X4200-Server-disk-hc-topology.xmlgen
rename : usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4500/Sun-Fire-X4500-hc-topology.xmlgen => usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4500/Sun-Fire-X4500-disk-hc-topology.xmlgen
rename : usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Sun-Fire-X4540-hc-topology.xmlgen => usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Sun-Fire-X4540-disk-hc-topology.xmlgen

show more ...

PSARC 2008/357 libtopo ses enumerator
6705260 want to enumerate external enclosures in libtopo
6705266 hc walker should compare nodes by something other than instance
6708851 libtopo topology DTD is

PSARC 2008/357 libtopo ses enumerator
6705260 want to enumerate external enclosures in libtopo
6705266 hc walker should compare nodes by something other than instance
6708851 libtopo topology DTD is broken
6708854 libtopo maps should be validated against DTD as part of lint
6709113 x86 xmlgen files generate invalid topology files
6709331 path topology attribute still hanging around
6709332 disk nodes can have invalid authority members

show more ...

6620038 Thor PCI topology deleted unused PCIe bridges and broke disk monitor topology
6620040 Update Thor Product Name in topology file

--HG--
rename : usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4550/M

6620038 Thor PCI topology deleted unused PCIe bridges and broke disk monitor topology
6620040 Update Thor Product Name in topology file

--HG--
rename : usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4550/Makefile => usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile
rename : usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4550/Sun-Fire-X4550-hc-topology.xmlgen => usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Sun-Fire-X4540-hc-topology.xmlgen

show more ...