[illumos-gate merge]

commit de0f04687a2a3fe3692d9ad1254738343bf9c4eb
    13310 Remove auto_ef.3ext as we don't have the software
commit 25befe07d3c1488cbbdecdb765cd0558e12cc364
    13302 pthread_attr_get_np.3c erroneously refers to pthread_getattr_np
commit 509a605d87b8005c687f8d8264f1be379620e886
    13304 bhyve ioport handling bungled on reinit
commit 83cd75bb2949d26e6eb38ddefc60fdeed1909643
    13309 bhyve movs emulation leaks mem refcnt
commit b713c91e508f40be7797bedd4ae1146ef0652625
    7537 want nextboot (one time boot) support
commit 09fcda9fe16a733cc35aa3156a47ef4b909251a6
    13172 Port OpenZFS: zfs label bootenv should store data as nvlist
commit c4ecba8aa5f13f00c2439c06af2aa1198771ee66
    13025 Port OpenZFS: Add support for boot environment data to be stored in the label
commit 1a2acdcd3ce765904dbf2bfc511e92d68022d100
    13308 testrunner/run needs updates for python 3.9
commit 04573c73a7ab1505c46b2c4db26bfde5176dd6a5
    13286 bhyve ins/outs emulation misuses %rax
commit 3dfdac06b0c70e672dbe56a2f38ec05fc0254d07
    13278 CTF assertion failed cmp->cm_tmap[id].cmt_map == suid
commit a676209deb2ce5d0c98f331659de25e2483f8c4c
    13252 ctf_update()/ctf_dwarf_convert_function() leak memory
commit effb27ee30c48fe502152c38487ced379d9f8693
    13247 CTF conversion fails with large files
    13251 CTF conversion fails if any CU is missing DWARF data

    Conflicts:
    usr/src/test/test-runner/cmd/run
    usr/src/lib/libctf/common/libctf.h
    usr/src/lib/libctf/common/ctf_convert.c

2 files changed, 7 insertions, 7 deletions

diff --git a/usr/src/lib/libc/port/threads/pthr_attr.c b/usr/src/lib/libc/port/threads/pthr_attr.c
index 7cfc970120..e5b3116eaf 100644
--- a/usr/src/lib/libc/port/threads/pthr_attr.c
+++ b/usr/src/lib/libc/port/threads/pthr_attr.c
@@ -529,16 +529,16 @@ pthread_attr_getname_np(pthread_attr_t *attr, char *buf, size_t len)
 /*
  * This function is a common BSD extension to pthread which is used to obtain
  * the attributes of a thread that might have changed after its creation, for
- * example, it's stack address.
+ * example, its stack address.
  *
  * Note, there is no setattr analogue, nor do we desire to add one at this time.
  * Similarly there is no native threads API analogue (nor should we add one for
  * C11).
  *
  * The astute reader may note that there is a GNU version of this called
- * pthread_getattr_np(). The two functions are similar, but subtley different in
- * a rather important way. While the pthread_attr_get_np() expects to be given
- * a pthread_attr_t that has had pthread_attr_init() called on in,
+ * pthread_getattr_np(). The two functions are similar, but subtly different in
+ * a rather important way. While pthread_attr_get_np() expects to be given
+ * a pthread_attr_t that has had pthread_attr_init() called on it,
  * pthread_getattr_np() does not. However, on GNU systems, where the function
  * originates, the pthread_attr_t is not opaque and thus it is entirely safe to
  * both call pthread_attr_init() and then call pthread_getattr_np() on the same
@@ -556,7 +556,7 @@ pthread_attr_get_np(pthread_t tid, pthread_attr_t *attr)
 
 	/*
 	 * To ensure that information about the target thread does not change or
-	 * disappear while we're trying to interrogate it, we grab the uwlp
+	 * disappear while we're trying to interrogate it, we grab the ulwp
 	 * lock.
 	 */
 	if (self->ul_lwpid == tid) {
diff --git a/usr/src/lib/libc/port/threads/pthread.c b/usr/src/lib/libc/port/threads/pthread.c
index dc0123361d..68c0fcbfa5 100644
--- a/usr/src/lib/libc/port/threads/pthread.c
+++ b/usr/src/lib/libc/port/threads/pthread.c
@@ -131,8 +131,8 @@ pthread_create(pthread_t *thread, const pthread_attr_t *attr,
 	    flag, &tid, ap->guardsize, ap->name);
 	if (error == 0) {
 		/*
-		 * Record the original inheritence value for
-		 * pthread_getattr_np(). We should always be able to find the
+		 * Record the original inheritance value for
+		 * pthread_attr_get_np(). We should always be able to find the
 		 * thread.
 		 */
 		(void) _thr_setinherit(tid, ap->inherit);