3623 kstat must accept partial stat specification
Reviewed by: Theo Schlossnagle <jesus@omniti.com>
Reviewed by: David Höppner <0xffea@gmail.com>
Reviewed by: Gordon Ross <gwr@nexenta.com>
Approved by: Eric Schrock <eric.schrock@delphix.com>
Back out hg changeset 829c00a55a37, bug 2986  --  introduces vulnerability
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
2986 nfs: exi refcounter leak at rfs3_lookup
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@nexenta.com>
3567 dtrace print() doesn't play well with ::dtrace
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Gordon Ross <gwr@nexenta.com>
Approved by: Garrett D'Amore <garrett@damore.org>
Merge /root/git/illumos-gate

* /root/git/illumos-gate:

commit 7994dfdd2a48fab1a1e1dc23109801c2f4cac5b3
    3567 dtrace print() doesn't play well with ::dtrace
commit fd9d0a82261102319cc3b862d8f2609c68e0fd23
    2986 nfs: exi refcounter leak at rfs3_lookup
commit 596bc2391087577f88d3665a6fb36aba8f1f2003
    Back out hg changeset 829c00a55a37, bug 2986  --  introduces vulnerability
commit 617413d1af18e7e9e5c76f416263615bbf1174a5
    3623 kstat must accept partial stat specification

Conflicts:
	usr/src/cmd/mdb/common/modules/dtrace/dtrace.c
	usr/src/uts/common/fs/nfs/nfs_server.c