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 2006/552 Quagga SMF Modifications
6312914 routeadm needs to support smf-based routing services
6440342 remove redundancies in smf-related makefiles by moving manifest rules to usr/src/cmd/Makef

PSARC 2006/552 Quagga SMF Modifications
6312914 routeadm needs to support smf-based routing services
6440342 remove redundancies in smf-related makefiles by moving manifest rules to usr/src/cmd/Makefile.targ

--HG--
rename : usr/src/cmd/cmd-inet/usr.sbin/in.rdisc.c => usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/in.rdisc.c
rename : usr/src/cmd/cmd-inet/usr.sbin/routeadm.c => usr/src/cmd/cmd-inet/usr.sbin/routeadm/routeadm.c
rename : deleted_files/usr/src/cmd/volmgt/etc/Makefile => usr/src/cmd/volmgt/etc/Makefile

show more ...

4766674 SVM allows creation of >8192 block metadb but does not use the space
4875636 metaset balance code broken during disk addition/deletion
5083314 metadb -i does not display/explain all flags.
50

4766674 SVM allows creation of >8192 block metadb but does not use the space
4875636 metaset balance code broken during disk addition/deletion
5083314 metadb -i does not display/explain all flags.
5095399 cleanup svm greenline services
5101318 "sd" sn_count in replicas gets incorrectly incremented
6322048 snv_23 panic assertion failed: (int)wcnt > 0, file:../../common/os/kstat_fr.c, line:1376
6329542 Diskset disks with no mddb have invalid timestamp in dummy master block.
6424946 rpc.mdcommd daemon runs out of file descriptors

show more ...

OpenSolaris Launch