[illumos-gate merge]

commit 0a554e9f2c0d440dc40a97fae2d18f1d428ca786
    13404 man page spelling errors
commit 9f76c6ed5b6ee0cc0bf631daca15ac3dc5fc70c4
    13400 zfs-tests: implicit conversion from 'enum dmu_objset_type' to 'enum lzc_dataset_type'
commit ef96fc31fc4f4306719704352d5c3e33573c039f
    13399 zfs: error: implicit conversion from 'boolean_t' to 'ds_hold_flags_t'
commit 56870e8c76c2675bcef1fcee5d519585ce9c768e
    13393 cheetah: case value '47616' not in enumerated type
commit 8247326397b1a16f37e70cf13f5b7a4f50d06712
    13403 zfs: symbol 'g_zfs' is multiply-defined
commit 436b964b19ef06803ad9165542d80d9d731d6486
    13402 zpool: symbol 'g_zfs' is multiply-defined
commit 99308ed0417a2b8ab73c5856a8a5345ce2a7aea7
    13396 PoolsExecption typo in resource pools javadoc
commit 1575b751c16622553e958c1e5c45e59c86b15c6e
    13392 px: case value '3' not in enumerated type
commit 9b0429a10eec9313ec782d8421272aff70adbfdc
    13339 Add support for Hygon Dhyana Family 18h processor
commit d20422bd742384b77102bb3bd09e0dc4b7372e50
    13351 loader: vbe_find_mode_xydm() is using wrong safety and iteration is buggy
commit 174b8e455f9a6974e69fa4e28792580acde0892d
    13311 uptime(1) dazed and confused for a minute after boot
commit f816551bb187d104fbf2757703d7a5d2189a3a18
    13401 eeprom: 'lv' may be used uninitialized in this function
commit 5e96da73c99d9d17ff5a58b793fff2ab6dcadf25
    13391 fm: build errors with gcc 7 on SPARC
commit 58b55f701e285559e4799354996fd284238ed0d4
    13398 libstand: xdrproc_t should return bool
commit c6a28d7650029501a356f7b75b2a10a5c4430cef
    13394 fhc: case value '4294967295' not in enumerated type
commit 58d4b16fe601073f2408de78e3db7e9bfa9abfd2
    13355 remove topo module warning gags
commit 1473b8d60e902819558a8b0e8a257eb0d754c3c3
    13388 ZFS list bookmark not working on zvols
commit 4bba12ca5cd6f92aaf0d4c0d19d05528110bc095
    13368 libbe_py should support temporary BE activation
commit a92282e44f968185a6bba094d1e5fece2da819cf
    13376 fm: variable may be used uninitialized
commit 8b1df8bf71b7b62e7e4d46fe6b457d4d6447b2b8
    13367 beadm activate -t should not promote new BE datasets
commit 9704bf7fb82e71b685e194a967937ff03843e73a
    13317 Decrease contention on dn_struct_rwlock
commit 88a08813800ed7ba7c927986421cee437f7f2233
    13363 ctfconvert could support more granular ignore for missing debug data
commit 3dd4cd56e7843e01a8ab147a0d102cd4f6d732c1
    13342 ctfconvert could encode _Float128 for 32-bit objects
commit 73197b540cc5f0434c409b68ca9e1a514a6ce91b
    13336 ctfconvert should be able to unconditionally attempt conversion
commit dd4422524768709a579a2a93a10c78a88a6b0ecb
    13280 CTF: provide option to truncate and continue

Conflicts & other fixes (with help from Jason King <jbk@joyent.com>):
    usr/src/lib/fm/topo/modules/common/ipmi/ipmi_enum.c
    usr/src/lib/libctf/common/ctf_convert.c
    usr/src/lib/libctf/common/ctf_lib.c
    usr/src/lib/libctf/common/libctf.h
    usr/src/lib/libproc/common/Psymtab.c
    usr/src/man/man1/ld.so.1.1
    usr/src/man/man4/process.4

2 files changed, 4 insertions, 10 deletions

diff --git a/usr/src/man/man3c/cond_init.3c b/usr/src/man/man3c/cond_init.3c
index d90296e420..198594167c 100644
--- a/usr/src/man/man3c/cond_init.3c
+++ b/usr/src/man/man3c/cond_init.3c
@@ -44,7 +44,7 @@
 .\" Copyright (c) 2001, The IEEE and The Open Group.  All Rights Reserved.
 .\" Copyright (c) 2007, Sun Microsystems, Inc.  All Rights Reserved.
 .\"
-.TH COND_INIT 3C "February 15, 2020"
+.TH COND_INIT 3C "December 28, 2020"
 .SH NAME
 cond_init, cond_wait, cond_timedwait, cond_reltimedwait, cond_signal,
 cond_broadcast, cond_destroy \- condition variables
@@ -435,7 +435,7 @@ The \fBcond_timedwait()\fR and \fBcond_reltimedwait()\fR functions are similar
 to \fBcond_wait()\fR, except that the calling thread will not wait for the
 condition to become true past the absolute time specified by \fIabstime\fR or
 the relative time specified by \fIreltime\fR. Note that \fBcond_timedwait()\fR
-or \fBcond_reltimedwait()\fR might continue to block as it trys to reacquire
+or \fBcond_reltimedwait()\fR might continue to block as it tries to reacquire
 the mutex pointed to by \fImp\fR, which may be locked by another thread. If
 either \fBcond_timedwait()\fR or \fBcond_reltimedwait()\fR returns because of a
 timeout, it returns the error value \fBETIME\fR.
diff --git a/usr/src/man/man3c/mbsrtowcs.3c b/usr/src/man/man3c/mbsrtowcs.3c
index bf4d3a04d9..05efa21401 100644
--- a/usr/src/man/man3c/mbsrtowcs.3c
+++ b/usr/src/man/man3c/mbsrtowcs.3c
@@ -44,12 +44,11 @@
 .\" Portions Copyright (c) 2003, Sun Microsystems, Inc.  All Rights Reserved.
 .\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\"
-.TH MBSRTOWCS 3C "Jun 28, 2014"
+.TH MBSRTOWCS 3C "December 28, 2020"
 .SH NAME
 mbsnrtowcs, mbsnrtowcs_l, mbsrtowcs, mbsrtowcs_l \- convert a character string
 to a wide-character string (restartable)
 .SH SYNOPSIS
-.LP
 .nf
 #include <wchar.h>
 
@@ -75,7 +74,6 @@ to a wide-character string (restartable)
      \fBsize_t\fR \fIlen\fR, \fBmbstate_t *restrict\fR \fIps\fR, \fBlocale_t\fR \fIloc\fR);
 .fi
 .SH DESCRIPTION
-.LP
 These function converts a sequence of characters, beginning in
 the conversion state described by the object pointed to by \fIps\fR, from the
 array indirectly pointed to by \fIsrc\fR into a sequence of corresponding
@@ -124,7 +122,6 @@ current locale.  See \fBenviron\fR(5). The functions \fBmbsrtowcs_l()\fR and
 \fBmbsnrtowcs()\fR, except that instead of using the current locale, they use
 the locale specified by \fIloc\fR.
 .SH RETURN VALUES
-.LP
 If the input conversion encounters a sequence of bytes that do not form a valid
 character, an encoding error occurs.  In this case, these
 functions store the value of the macro \fBEILSEQ\fR in \fBerrno\fR and return
@@ -132,8 +129,7 @@ functions store the value of the macro \fBEILSEQ\fR in \fBerrno\fR and return
 the number of characters successfully converted, not including the terminating
 null (if any).
 .SH ERRORS
-.LP
-Theses functions may fail if:
+These functions may fail if:
 .sp
 .ne 2
 .na
@@ -153,7 +149,6 @@ state.
 Invalid character sequence is detected.
 .RE
 .SH ATTRIBUTES
-.LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .TS
 box;
@@ -183,7 +178,6 @@ multithreaded applications, otherwise they use an
 internal \fBmbstate_t\fR object and are Unsafe in multithreaded
 applications.
 .SH SEE ALSO
-.LP
 \fBmbrtowc\fR(3C), \fBmbsinit\fR(3C), \fBnewlocale\fR(3C),
 \fBsetlocale\fR(3C), \fBuselocale()\fR, \fBattributes\fR(5),
 \fBenviron\fR(5), \fBstandards\fR(5)