[illumos-gate merge]

commit b30f02def0d29c7f2398666939cf35cf81f809f1
    12850 demangle(1) can trip up on names starting with underscore
commit 61de0de2b543856b77c5769b0d8981f58a7f26bd
    12829 Add Zstandard to /etc/magic
commit f2fe7acaed48e65ea8626868085ea6e40a63b3a9
    12763 ixgbe ufm support
commit a377495feb6d6c6a51d6cca4065a74f320f29a07
    12762 topo should create per-device UFM entries by default
commit 44b0ba916e529fad7fa22597911db69ae8f24994
    12761 i40e should only register ufm data on func 0
commit 8d55b80625b903a8ec6c560f6a38b5c16d1f5cfc
    12759 Want ability to read ufm images
    12758 ufm_detach doesn't properly clean up
    12760 igb ufm support
    12765 fwflash plugin cleanup handling is buggy
commit 1fa07ac719189ed3e8a0f8170264877c29bff62b
    12848 Clarify bhyve's dual license
commit 154972aff898a787b38af3bab5b8d754b5a42447
    12792 bhyve upstream sync 2020 May
commit 440a8a36792bdf9ef51639066aab0b7771ffcab8
    12789 increase timers allowed per-process
commit 926d645fe2416b8ee611fc8ee4e28b7c7f9744dd
    12531 storage: NULL pointer errors

	Conflicts:
	usr/src/test/os-tests/tests/Makefile
	usr/src/test/os-tests/tests/timer/Makefile
	usr/src/test/os-tests/tests/timer/timer_limit.c
	usr/src/uts/common/os/timer.c
	usr/src/uts/common/sys/timer.h
	usr/src/uts/common/syscall/sysconfig.c

1 files changed, 11 insertions, 11 deletions

diff --git a/usr/src/uts/common/sys/proc.h b/usr/src/uts/common/sys/proc.h
index 7d2209132d..757bbc87e7 100644
--- a/usr/src/uts/common/sys/proc.h
+++ b/usr/src/uts/common/sys/proc.h
@@ -153,7 +153,7 @@ typedef struct	proc {
 	char	p_stat;			/* status of process */
 	char	p_wcode;		/* current wait code */
 	ushort_t p_pidflag;		/* flags protected only by pidlock */
-	int 	p_wdata;		/* current wait return value */
+	int	p_wdata;		/* current wait return value */
 	pid_t	p_ppid;			/* process id of parent */
 	struct	proc	*p_link;	/* forward link */
 	struct	proc	*p_parent;	/* ptr to parent process */
@@ -162,16 +162,16 @@ typedef struct	proc {
 	struct	proc	*p_psibling;	/* ptr to prev sibling proc on chain */
 	struct	proc	*p_sibling_ns;	/* prt to siblings with new state */
 	struct	proc	*p_child_ns;	/* prt to children with new state */
-	struct	proc 	*p_next;	/* active chain link next */
-	struct	proc 	*p_prev;	/* active chain link prev */
-	struct	proc 	*p_nextofkin;	/* gets accounting info at exit */
-	struct	proc 	*p_orphan;
-	struct	proc 	*p_nextorph;
+	struct	proc	*p_next;	/* active chain link next */
+	struct	proc	*p_prev;	/* active chain link prev */
+	struct	proc	*p_nextofkin;	/* gets accounting info at exit */
+	struct	proc	*p_orphan;
+	struct	proc	*p_nextorph;
 	struct	proc	*p_pglink;	/* process group hash chain link next */
 	struct	proc	*p_ppglink;	/* process group hash chain link prev */
 	struct	sess	*p_sessp;	/* session information */
-	struct	pid 	*p_pidp;	/* process ID info */
-	struct	pid 	*p_pgidp;	/* process group ID info */
+	struct	pid	*p_pidp;	/* process ID info */
+	struct	pid	*p_pgidp;	/* process group ID info */
 	/*
 	 * Fields protected by p_lock
 	 */
@@ -216,7 +216,7 @@ typedef struct	proc {
 	 * Per process lwp and kernel thread stuff
 	 */
 	id_t	p_lwpid;		/* most recently allocated lwpid */
-	int 	p_lwpcnt;		/* number of lwps in this process */
+	int	p_lwpcnt;		/* number of lwps in this process */
 	int	p_lwprcnt;		/* number of not stopped lwps */
 	int	p_lwpdaemon;		/* number of TP_DAEMON lwps */
 	int	p_lwpwait;		/* number of lwps in lwp_wait() */
@@ -701,7 +701,7 @@ extern	kthread_t	*thread_create(
 	void		(*proc)(),
 	void		*arg,
 	size_t		len,
-	proc_t 		*pp,
+	proc_t		*pp,
 	int		state,
 	pri_t		pri);
 extern	void	thread_exit(void) __NORETURN;
@@ -748,7 +748,7 @@ extern	int	tsd_agent_set(kthread_t *, uint_t, void *);
 /* lwp function prototypes */
 
 extern kthread_t *lwp_kernel_create(proc_t *, void (*)(), void *, int, pri_t);
-extern	klwp_t 		*lwp_create(
+extern	klwp_t		*lwp_create(
 	void		(*proc)(),
 	caddr_t		arg,
 	size_t		len,