[illumos-gate merge]

commit 696c22af67f1944ec22b4086570891189a8e7201
    9475 libefi: Do not return only if ReceiveFilter fails
commit fec46055b92c6c6721fc6698843744a264e6ca70
    9376 sendmail: this statement may fall through
commit 7267b93f5f67b15927e4bf44f0ad2efa84727226
    9618 i40e_main.c: Few minor typos in comments
commit 4c28a617e3922d92a58e813a5b955eb526b9c386
    9598 Need Eager FPU
commit a32a1f376ed9360264e4a374608fdcc5c4927d63
    9597 Want hypervisor API for FPU management
commit d0158222a5936ac26b7a03241b7d2df18cc544c8
    9596 Initial xsave xstate_bv should not include all features
    9595 rtld should conditionally save AVX-512 state

	Conflicts:
	usr/src/uts/intel/ia32/os/fpu.c
	usr/src/uts/common/sys/user.h
	usr/src/cmd/sgs/libconv/common/corenote.c
	usr/src/cmd/ptools/pargs/pargs.c

12 files changed, 30 insertions, 32 deletions

diff --git a/usr/src/boot/sys/boot/efi/libefi/efinet.c b/usr/src/boot/sys/boot/efi/libefi/efinet.c
index 910707a680..c15364cb9d 100644
--- a/usr/src/boot/sys/boot/efi/libefi/efinet.c
+++ b/usr/src/boot/sys/boot/efi/libefi/efinet.c
@@ -48,7 +48,7 @@ static int efinet_match(struct netif *, void *);
 static int efinet_probe(struct netif *, void *);
 static ssize_t efinet_put(struct iodesc *, void *, size_t);
 
-struct netif_driver efinetif = {   
+struct netif_driver efinetif = {
 	.netif_bname = "efinet",
 	.netif_match = efinet_match,
 	.netif_probe = efinet_probe,
@@ -132,7 +132,7 @@ efinet_put(struct iodesc *desc, void *pkt, size_t len)
 		buf = NULL;	/* XXX Is this needed? */
 		status = net->GetStatus(net, NULL, &buf);
 		/*
-		 * XXX EFI1.1 and the E1000 card returns a different 
+		 * XXX EFI1.1 and the E1000 card returns a different
 		 * address than we gave.  Sigh.
 		 */
 	} while (status == EFI_SUCCESS && buf == NULL);
@@ -224,11 +224,9 @@ efinet_init(struct iodesc *desc, void *machdep_hint)
 	    EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST;
 
 	status = net->ReceiveFilters(net, mask, 0, FALSE, 0, NULL);
-	if (status != EFI_SUCCESS) {
+	if (status != EFI_SUCCESS)
 		printf("net%d: cannot set rx. filters (status=%lu)\n",
 		    nif->nif_unit, EFI_ERROR_CODE(status));
-		return;
-	}
 
 #ifdef EFINET_DEBUG
 	dump_mode(net->Mode);
@@ -241,7 +239,7 @@ efinet_init(struct iodesc *desc, void *machdep_hint)
 static void
 efinet_end(struct netif *nif)
 {
-	EFI_SIMPLE_NETWORK *net = nif->nif_devdata; 
+	EFI_SIMPLE_NETWORK *net = nif->nif_devdata;
 
 	if (net == NULL)
 		return;
diff --git a/usr/src/cmd/sendmail/aux/editmap.c b/usr/src/cmd/sendmail/aux/editmap.c
index 46d9fd10ba..a86a24d456 100644
--- a/usr/src/cmd/sendmail/aux/editmap.c
+++ b/usr/src/cmd/sendmail/aux/editmap.c
@@ -11,8 +11,6 @@
  *
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sm/gen.h>
 #ifndef lint
 SM_UNUSED(static char copyright[]) =
@@ -263,7 +261,7 @@ main(argc, argv)
 # endif /* UID_MAX */
 				break;
 			}
-
+			/* FALLTHROUGH */
 
 		  default:
 			continue;
diff --git a/usr/src/cmd/sendmail/aux/mail.local.c b/usr/src/cmd/sendmail/aux/mail.local.c
index 98f4fb6636..0d04d3c58c 100644
--- a/usr/src/cmd/sendmail/aux/mail.local.c
+++ b/usr/src/cmd/sendmail/aux/mail.local.c
@@ -19,7 +19,7 @@ static char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#pragma ident  "%Z%%M% %I%     %E% SMI"
 
 #ifndef lint
 static char sccsid[] = "@(#)mail.local.c	8.83 (Berkeley) 12/17/98";
@@ -1145,9 +1145,9 @@ e_to_sys(num)
 			eval = EX_UNAVAILABLE;
 			break;
 		}
-		/* FALLTHROUGH */
 #endif /* EDQUOT */
 #ifdef EAGAIN
+		/* FALLTHROUGH */
 	case EAGAIN:		/* Resource temporarily unavailable */
 #endif
 #ifdef EBUSY
diff --git a/usr/src/cmd/sendmail/aux/mailstats.c b/usr/src/cmd/sendmail/aux/mailstats.c
index f7870aa7de..6c5f9a18f8 100644
--- a/usr/src/cmd/sendmail/aux/mailstats.c
+++ b/usr/src/cmd/sendmail/aux/mailstats.c
@@ -12,8 +12,6 @@
  *
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sm/gen.h>
 
 SM_IDSTR(copyright,
@@ -182,6 +180,7 @@ main(argc, argv)
 			}
 			if (sfile == NULL)
 				sfile = sfilebuf;
+			/* FALLTHROUGH */
 
 		  default:
 			continue;
diff --git a/usr/src/cmd/sendmail/aux/makemap.c b/usr/src/cmd/sendmail/aux/makemap.c
index d887386ffc..3b4ab68ba5 100644
--- a/usr/src/cmd/sendmail/aux/makemap.c
+++ b/usr/src/cmd/sendmail/aux/makemap.c
@@ -11,8 +11,6 @@
  *
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sm/gen.h>
 
 SM_IDSTR(copyright,
@@ -24,7 +22,6 @@ SM_IDSTR(copyright,
 
 SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.179 2008/04/14 02:06:16 ca Exp $")
 
-
 #include <sys/types.h>
 #ifndef ISC_UNIX
 # include <sys/file.h>
@@ -290,7 +287,7 @@ main(argc, argv)
 # endif /* UID_MAX */
 				break;
 			}
-
+			/* FALLTHROUGH */
 
 		  default:
 			continue;
diff --git a/usr/src/cmd/sendmail/aux/praliases.c b/usr/src/cmd/sendmail/aux/praliases.c
index d0ee54e37a..8839334286 100644
--- a/usr/src/cmd/sendmail/aux/praliases.c
+++ b/usr/src/cmd/sendmail/aux/praliases.c
@@ -217,6 +217,7 @@ main(argc, argv)
 				}
 				praliases(b, argc, argv);
 			}
+			/* FALLTHROUGH */
 
 		  default:
 			continue;
diff --git a/usr/src/cmd/sendmail/db/hash/hash_func.c b/usr/src/cmd/sendmail/db/hash/hash_func.c
index 4809a8098e..6819a54184 100644
--- a/usr/src/cmd/sendmail/db/hash/hash_func.c
+++ b/usr/src/cmd/sendmail/db/hash/hash_func.c
@@ -50,13 +50,6 @@
 
 #include "config.h"
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#ifndef lint
-static const char sccsid[] = "@(#)hash_func.c	10.7 (Sleepycat) 9/16/97";
-static const char sccsi2[] = "%W% (Sun) %G%";
-#endif /* not lint */
-
 #ifndef NO_SYSTEM_INCLUDES
 #include <sys/types.h>
 #endif
@@ -124,18 +117,25 @@ __ham_func3(key, len)
 	case 0:
 		do {
 			HASHC;
+			/* FALLTHROUGH */
 	case 7:
 			HASHC;
+			/* FALLTHROUGH */
 	case 6:
 			HASHC;
+			/* FALLTHROUGH */
 	case 5:
 			HASHC;
+			/* FALLTHROUGH */
 	case 4:
 			HASHC;
+			/* FALLTHROUGH */
 	case 3:
 			HASHC;
+			/* FALLTHROUGH */
 	case 2:
 			HASHC;
+			/* FALLTHROUGH */
 	case 1:
 			HASHC;
 		} while (--loop);
@@ -173,18 +173,25 @@ __ham_func4(key, len)
 	case 0:
 		do {
 			HASH4;
+			/* FALLTHROUGH */
 	case 7:
 			HASH4;
+			/* FALLTHROUGH */
 	case 6:
 			HASH4;
+			/* FALLTHROUGH */
 	case 5:
 			HASH4;
+			/* FALLTHROUGH */
 	case 4:
 			HASH4;
+			/* FALLTHROUGH */
 	case 3:
 			HASH4;
+			/* FALLTHROUGH */
 	case 2:
 			HASH4;
+			/* FALLTHROUGH */
 	case 1:
 			HASH4;
 		} while (--loop);
diff --git a/usr/src/cmd/sendmail/src/alias.c b/usr/src/cmd/sendmail/src/alias.c
index d8a6562b8e..c94a47767a 100644
--- a/usr/src/cmd/sendmail/src/alias.c
+++ b/usr/src/cmd/sendmail/src/alias.c
@@ -11,8 +11,6 @@
  *
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sendmail.h>
 
 SM_RCSID("@(#)$Id: alias.c,v 8.219 2006/10/24 18:04:09 ca Exp $")
@@ -990,6 +988,7 @@ forward(user, sendq, aliaslevel, e)
 				break;
 #endif /* _FFR_FORWARD_SYSERR */
 
+				/* FALLTHROUGH */
 			  default:
 				if (LogLevel > (RunAsUid == 0 ? 2 : 10))
 					sm_syslog(LOG_WARNING, e->e_id,
diff --git a/usr/src/cmd/sendmail/src/domain.c b/usr/src/cmd/sendmail/src/domain.c
index 3b3a6d3971..4c5b23819c 100644
--- a/usr/src/cmd/sendmail/src/domain.c
+++ b/usr/src/cmd/sendmail/src/domain.c
@@ -11,8 +11,6 @@
  *
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sendmail.h>
 #include "map.h"
 
@@ -1043,9 +1041,9 @@ nexttype:
 				**  Such MX matches are as good as an A match,
 				**  fall through.
 				*/
-				/* FALLTHROUGH */
 
 # if NETINET6
+				/* FALLTHROUGH */
 			  case T_AAAA:
 # endif /* NETINET6 */
 			  case T_A:
diff --git a/usr/src/cmd/sendmail/src/queue.c b/usr/src/cmd/sendmail/src/queue.c
index 194f5250d6..9bafb02194 100644
--- a/usr/src/cmd/sendmail/src/queue.c
+++ b/usr/src/cmd/sendmail/src/queue.c
@@ -4468,6 +4468,7 @@ readqf(e, openonly)
 			/* format: flag (1 char) space long-integer */
 			e->e_dlvr_flag = buf[1];
 			e->e_deliver_by = strtol(&buf[3], NULL, 10);
+			/* FALLTHROUGH */
 
 		  case '$':		/* define macro */
 			{
diff --git a/usr/src/uts/common/io/i40e/i40e_main.c b/usr/src/uts/common/io/i40e/i40e_main.c
index c15acbb265..4f6ef25600 100644
--- a/usr/src/uts/common/io/i40e/i40e_main.c
+++ b/usr/src/uts/common/io/i40e/i40e_main.c
@@ -137,7 +137,7 @@
  * resources between everything, we'll end up just dividing the resources
  * evenly between all of the functions. Longer term, if we don't have to declare
  * to the GLDv3 that these resources are shared, then we'll maintain a pool and
- * hae each PF allocate from the pool in the device, thus if only two of four
+ * have each PF allocate from the pool in the device, thus if only two of four
  * ports are being used, for example, then all of the resources can still be
  * used.
  *
@@ -169,7 +169,7 @@
  * To receieve broadcast traffic, we enable it through the admin queue, rather
  * than use one of our filters for it. For multicast traffic, we reserve a
  * certain number of the hash filters and assign them to a given PF. When we
- * exceed those, we then switch to using promicuous mode for multicast traffic.
+ * exceed those, we then switch to using promiscuous mode for multicast traffic.
  *
  * More specifically, once we exceed the number of filters (indicated because
  * the i40e_t`i40e_resources.ifr_nmcastfilt ==
diff --git a/usr/src/uts/intel/ia32/os/fpu.c b/usr/src/uts/intel/ia32/os/fpu.c
index ddfc821579..651f4a745f 100644
--- a/usr/src/uts/intel/ia32/os/fpu.c
+++ b/usr/src/uts/intel/ia32/os/fpu.c
@@ -66,7 +66,7 @@
  * -----------------------
  *
  * The x86 FPU has evolved substantially since its days as the x87 coprocessor;
- * however, many aspects of its life as a coprocessor still still around in x86.
+ * however, many aspects of its life as a coprocessor are still around in x86.
  *
  * Today, when we refer to the 'FPU', we don't just mean the original x87 FPU.
  * While that state still exists, there is much more that is covered by the FPU.