[illumos-gate merge]

commit 1951a93366b3e52f7c49ec9b2dbfb21bccc56a3e
    7837 smbios3 64-bit entry point support
commit ec2c76eb1d5ecd7a4fccccefc1bc4aa7c1531606
    7854 installboot should set MBR to load partition boot block if it was installed
commit 48bbca816818409505a6e214d0911fda44e622e3
    7812 Remove gender specific language
commit e40108ff341f07fe03e96c751c6cf2cb5867d1a8
    7898 mdb's ::netstat doesn't print UDP conn_t pointer correctly

	Conflicts:
	usr/src/uts/common/syscall/poll.c

4 files changed, 13 insertions, 7 deletions

diff --git a/usr/src/cmd/sendmail/aux/vacation.c b/usr/src/cmd/sendmail/aux/vacation.c
index ce922d3c41..d1f3675985 100644
--- a/usr/src/cmd/sendmail/aux/vacation.c
+++ b/usr/src/cmd/sendmail/aux/vacation.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
  *
  *	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T
  *	  All Rights Reserved
@@ -47,7 +48,7 @@ static char	SccsId[] = "%W%	%E% SMI";
  *	For best operation, this program should run setuid to
  *	root or uucp or someone else that sendmail will believe
  *	a -f flag from.  Otherwise, the user must be careful
- *	to include a header on his .vacation.msg file.
+ *	to include a header on their .vacation.msg file.
  *
  *	Positional Parameters:
  *		the user to collect the vacation message from.
diff --git a/usr/src/cmd/sendmail/src/conf.c b/usr/src/cmd/sendmail/src/conf.c
index f5504c0b56..8c8ca6e788 100644
--- a/usr/src/cmd/sendmail/src/conf.c
+++ b/usr/src/cmd/sendmail/src/conf.c
@@ -14,6 +14,7 @@
 /*
  * Copyright 1999-2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright (c) 2016 by Delphix. All rights reserved.
  */
 
 #include <sendmail.h>
@@ -1152,7 +1153,7 @@ username()
 **  TTYPATH -- Get the path of the user's tty
 **
 **	Returns the pathname of the user's tty.  Returns NULL if
-**	the user is not logged in or if s/he has write permission
+**	the user is not logged in or if they have write permission
 **	denied.
 **
 **	Parameters:
diff --git a/usr/src/cmd/sendmail/src/envelope.c b/usr/src/cmd/sendmail/src/envelope.c
index 022c3ca8b2..80fa857e84 100644
--- a/usr/src/cmd/sendmail/src/envelope.c
+++ b/usr/src/cmd/sendmail/src/envelope.c
@@ -10,7 +10,9 @@
  * the sendmail distribution.
  *
  */
-
+/*
+ * Copyright (c) 2016 by Delphix. All rights reserved.
+ */
 #include <sendmail.h>
 
 SM_RCSID("@(#)$Id: envelope.c,v 8.310 2009/12/18 17:08:01 ca Exp $")
@@ -930,7 +932,7 @@ closexscript(e)
 **  SETSENDER -- set the person who this message is from
 **
 **	Under certain circumstances allow the user to say who
-**	s/he is (using -f or -r).  These are:
+**	they are (using -f or -r).  These are:
 **	1.  The user's uid is zero (root).
 **	2.  The user's login name is in an approved list (typically
 **	    from a network server).
diff --git a/usr/src/cmd/sendmail/src/savemail.c b/usr/src/cmd/sendmail/src/savemail.c
index 4178245cc5..97816041e8 100644
--- a/usr/src/cmd/sendmail/src/savemail.c
+++ b/usr/src/cmd/sendmail/src/savemail.c
@@ -10,7 +10,9 @@
  * the sendmail distribution.
  *
  */
-
+/*
+ * Copyright (c) 2016 by Delphix. All rights reserved.
+ */
 #include <sendmail.h>
 
 SM_RCSID("@(#)$Id: savemail.c,v 8.314 2009/12/18 17:08:01 ca Exp $")
@@ -23,7 +25,7 @@ static bool	pruneroute __P((char *));
 **
 **	If mailing back errors, mail it back to the originator
 **	together with an error message; otherwise, just put it in
-**	dead.letter in the user's home directory (if he exists on
+**	dead.letter in the user's home directory (if they exist on
 **	this machine).
 **
 **	Parameters:
@@ -37,7 +39,7 @@ static bool	pruneroute __P((char *));
 **
 **	Side Effects:
 **		Saves the letter, by writing or mailing it back to the
-**		sender, or by putting it in dead.letter in her home
+**		sender, or by putting it in dead.letter in their home
 **		directory.
 */