[illumos-gate merge]

commit 7105039931b43c4efeda411cd0527843723c90bd
    14887 audio_legacy_* prototypes can be removed
commit b75a8b718b0b6c50c43b47b15603947383771a04
    14873 Retire ddi_getiminor()
commit 5b2c4190a831f52d91a5b92473ffb5a06e84511d
    14812 pcie: properly set max packet size and tagging
commit bdb5139270356ff627abb9467f2b4fc8db3fb81d
    14827 overlay_m_stop() blows verify in race with overlay_target_inject()
    14853 overlay_setprop_vnetid bungles OVERLAY_F_MDDROP
commit 2c76d75129011c98e79463bb84917b828f922a11
    13700 pollhead_delete trips over bad pointer

Conflicts:
    manifest
    usr/src/uts/common/sys/overlay_impl.h
    usr/src/uts/common/syscall/poll.c

3 files changed, 3 insertions, 99 deletions

diff --git a/usr/src/man/man9f/Intro.9f b/usr/src/man/man9f/Intro.9f
index 3e0627b878..bc90a70681 100644
--- a/usr/src/man/man9f/Intro.9f
+++ b/usr/src/man/man9f/Intro.9f
@@ -1,10 +1,10 @@
 '\" te
-.\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\" Copyright (c) 2005, Sun Microsystems, Inc., All Rights Reserved
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH INTRO 9F "Feb 06, 2012"
+.\" Copyright 2022 Garrett D'Amore
+.TH INTRO 9F "July 30, 2022"
 .SH NAME
 Intro, intro \- introduction to DDI/DKI functions
 .SH DESCRIPTION
@@ -399,7 +399,6 @@ _
 \fBddi_get_driver_private\fR	illumos DDI
 \fBddi_get_eventcookie\fR	illumos DDI
 \fBddi_get_iblock_cookie\fR	illumos DDI
-\fBddi_get_iminor\fR	illumos DDI
 \fBddi_get_instance\fR	illumos DDI
 \fBddi_get_kt_did\fR	illumos DDI
 \fBddi_get_lbolt\fR	illumos DDI
diff --git a/usr/src/man/man9f/Makefile b/usr/src/man/man9f/Makefile
index 9bbb662981..f2a8ba5f80 100644
--- a/usr/src/man/man9f/Makefile
+++ b/usr/src/man/man9f/Makefile
@@ -11,12 +11,12 @@
 
 #
 # Copyright 2017, Richard Lowe
-# Copyright 2014 Garrett D'Amore <garrett@damore>
 # Copyright 2019 Joyent, Inc.
 # Copyright 2020-2021 Tintri by DDN, Inc. All rights reserved.
 # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
 # Copyright 2022 RackTop Systems, Inc.
 # Copyright 2022 Oxide Computer Company
+# Copyright 2022 Garrett D'Amore
 #
 
 include		$(SRC)/Makefile.master
@@ -191,7 +191,6 @@ MANFILES=	ASSERT.9f				\
 		ddi_get_parent.9f			\
 		ddi_get_pid.9f				\
 		ddi_get_time.9f				\
-		ddi_getiminor.9f			\
 		ddi_in_panic.9f				\
 		ddi_intr_add_handler.9f			\
 		ddi_intr_add_softint.9f			\
diff --git a/usr/src/man/man9f/ddi_getiminor.9f b/usr/src/man/man9f/ddi_getiminor.9f
deleted file mode 100644
index 29ab0cf54a..0000000000
--- a/usr/src/man/man9f/ddi_getiminor.9f
+++ /dev/null
@@ -1,94 +0,0 @@
-'\" te
-.\" Copyright (c) 2004, Sun Microsystems, Inc.
-.\"  All Rights Reserved
-.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
-.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH DDI_GETIMINOR 9F "Nov 18, 2004"
-.SH NAME
-ddi_getiminor \- get kernel internal minor number from an external dev_t
-.SH SYNOPSIS
-.LP
-.nf
-#include <sys/types.h>
-#include <sys/mkdev.h>
-#include <sys/ddi.h>
-
-
-
-\fBminor_t\fR \fBddi_getiminor\fR(\fBdev_t\fR \fIdev\fR);
-.fi
-
-.SH INTERFACE LEVEL
-.sp
-.LP
-This interface is obsolete. \fBgetminor\fR(9F) should be used instead.
-.SH PARAMETERS
-.sp
-.LP
-The following parameters are supported:
-.sp
-.ne 2
-.na
-\fB\fIdev\fR\fR
-.ad
-.RS 7n
-Device number.
-.RE
-
-.SH DESCRIPTION
-.sp
-.LP
-\fBddi_getiminor()\fR extracts the minor number from a device number. This call
-should be used only for device numbers that have been passed to the kernel from
-the user space through opaque interfaces such as the contents of
-\fBioctl\fR(9E) and \fBputmsg\fR(2). The device numbers passed in using
-standard device entry points must continue to be interpreted using the
-\fBgetminor\fR(9F) interface. This new interface is used to translate between
-user visible device numbers and in kernel device numbers. The two numbers may
-differ in a clustered system.
-.sp
-.LP
-For certain bus types, you can call this \fBDDI\fR function from a
-high-interrupt context.  These types include \fBISA\fR and SBus buses.  See
-\fBsysbus\fR(5), \fBisa\fR(5), and \fBsbus\fR(5) for details.
-.SH CONTEXT
-.sp
-.LP
-\fBddi_getiminor()\fR can be called from user context only.
-.SH RETURN VALUES
-.sp
-.LP
-The minor number or \fBEMINOR_UNKNOWN\fR if the minor number of the device is
-invalid.
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(7) for a description of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-Stability Level	Obsolete
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-.BR attributes (7),
-.BR getmajor (9F),
-.BR getminor (9F),
-.BR makedevice (9F)
-.sp
-.LP
-\fIWriting Device Drivers\fR
-.SH WARNINGS
-.sp
-.LP
-Drivers are required to replace calls to \fBddi_getminor.9f\fR by
-\fBgetminor\fR(9F)) in order to compile under Solaris 10 and later versions.