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

6432546 files under version control should not have their permissions changed
6432538 some files want to be set free (from the tyranny of version control)

--HG--
rename : usr/src/cmd/man/src/util/ns

6432546 files under version control should not have their permissions changed
6432538 some files want to be set free (from the tyranny of version control)

--HG--
rename : usr/src/cmd/man/src/util/nsgmls.src/lib/Makefile.dep => deleted_files/usr/src/cmd/man/src/util/nsgmls.src/lib/Makefile.dep
rename : usr/src/cmd/man/src/util/nsgmls.src/lib/app_inst.cxx => deleted_files/usr/src/cmd/man/src/util/nsgmls.src/lib/app_inst.cxx
rename : usr/src/cmd/man/src/util/nsgmls.src/lib/arc_inst.cxx => deleted_files/usr/src/cmd/man/src/util/nsgmls.src/lib/arc_inst.cxx
rename : usr/src/cmd/man/src/util/nsgmls.src/lib/entmgr_inst.cxx => deleted_files/usr/src/cmd/man/src/util/nsgmls.src/lib/entmgr_inst.cxx
rename : usr/src/cmd/man/src/util/nsgmls.src/lib/parser_inst.cxx => deleted_files/usr/src/cmd/man/src/util/nsgmls.src/lib/parser_inst.cxx
rename : usr/src/cmd/man/src/util/nsgmls.src/lib/xentmgr_inst.cxx => deleted_files/usr/src/cmd/man/src/util/nsgmls.src/lib/xentmgr_inst.cxx
rename : usr/src/cmd/man/src/util/nsgmls.src/nsgmls/Makefile.dep => deleted_files/usr/src/cmd/man/src/util/nsgmls.src/nsgmls/Makefile.dep
rename : usr/src/cmd/man/src/util/nsgmls.src/nsgmls/ir.out => deleted_files/usr/src/cmd/man/src/util/nsgmls.src/nsgmls/ir.out
rename : usr/src/cmd/man/src/util/nsgmls.src/nsgmls/nsgmls_inst.cxx => deleted_files/usr/src/cmd/man/src/util/nsgmls.src/nsgmls/nsgmls_inst.cxx
rename : usr/src/cmd/print/printmgr/com/sun/admin/pm/client/helptools/parsehelp => usr/src/cmd/print/printmgr/com/sun/admin/pm/client/helptools/parsehelp.sh
rename : usr/src/lib/libresolv2/include/make_os_version => usr/src/lib/libresolv2/include/make_os_version.sh
rename : usr/src/lib/libresolv2/include/probe_ipv6 => usr/src/lib/libresolv2/include/probe_ipv6.sh

show more ...

OpenSolaris Launch