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 ...

6878294 FMA is too aggressive in marking the disk as faulty for zfs relocated the fatal read media error
6895028 libtopo does not work on Netra-X4200-M2 platform
6892864 setserdsuffix() should work w

6878294 FMA is too aggressive in marking the disk as faulty for zfs relocated the fatal read media error
6895028 libtopo does not work on Netra-X4200-M2 platform
6892864 setserdsuffix() should work with integer type

show more ...