[illumos-gate merge]

commit 865498e43471404cd766389d4b8e045ed6ef3be1
commit 6205b5c44bad9044e168b06aef439c2e7cdc8a89
    12508 ndi_devi_alloc() and friends could take const char * names
commit e98dc02a871a9cd0498c8862434b16aa85e772d3
    12482 Have /usr/bin/awk point to /usr/bin/nawk
commit 9e717e77bf4b9b5ad279c38a2311c076468e85f5
    12496 bge mac address initialization is wrong
    12497 bge ape locking left always disabled after 7513
    12498 bge ring interrupt masking logic is broken
commit a2876d03ca2556102e024ae4a50bb4db8fe562b0
    12450 Add support for BCM57765 family devices to bge
commit 85f496fabdffd32673f6be280a3caa103f7d58a5
    12520 Enable IPv6 tso in igb, ixgbe, and i40e
commit 0418219cf21334a9c6712bbb2cec543b2ee4f989
    12552 increase get_max_pages
commit ee73640b6a4781aa745f3868c448d1b9dd1c29f6
    12469 mlxcx: errors in package metadata

	Conflicts:
	usr/src/man/man1/nawk.1 [deleted upstream]

3 files changed, 46 insertions, 6 deletions

diff --git a/usr/src/pkg/manifests/driver-network-bge.mf b/usr/src/pkg/manifests/driver-network-bge.mf
index 6ac1368ea0..0dc0ff7a50 100644
--- a/usr/src/pkg/manifests/driver-network-bge.mf
+++ b/usr/src/pkg/manifests/driver-network-bge.mf
@@ -48,6 +48,16 @@ $(i386_ONLY)driver name=bge clone_perms="bge 0666 root sys" \
     alias=pci108e,1648 \
     alias=pci108e,16a7 \
     alias=pci108e,16a8 \
+    alias=pci14e4,0x1682 \
+    alias=pci14e4,0x1686 \
+    alias=pci14e4,0x16b0 \
+    alias=pci14e4,0x16b1 \
+    alias=pci14e4,0x16b2 \
+    alias=pci14e4,0x16b3 \
+    alias=pci14e4,0x16b4 \
+    alias=pci14e4,0x16b5 \
+    alias=pci14e4,0x16b6 \
+    alias=pci14e4,0x16b7 \
     alias=pci14e4,1600 \
     alias=pci14e4,1601 \
     alias=pci14e4,1644 \
@@ -77,6 +87,16 @@ $(i386_ONLY)driver name=bge clone_perms="bge 0666 root sys" \
     alias=pci14e4,16a7 \
     alias=pci14e4,16a8 \
     alias=pci14e4,16c7 \
+    alias=pciex14e4,0x1682 \
+    alias=pciex14e4,0x1686 \
+    alias=pciex14e4,0x16b0 \
+    alias=pciex14e4,0x16b1 \
+    alias=pciex14e4,0x16b2 \
+    alias=pciex14e4,0x16b3 \
+    alias=pciex14e4,0x16b4 \
+    alias=pciex14e4,0x16b5 \
+    alias=pciex14e4,0x16b6 \
+    alias=pciex14e4,0x16b7 \
     alias=pciex14e4,1643 \
     alias=pciex14e4,1655 \
     alias=pciex14e4,1656 \
@@ -106,6 +126,16 @@ $(sparc_ONLY)driver name=bge clone_perms="bge 0666 root sys" \
     alias=pci108e,1648 \
     alias=pci108e,16a7 \
     alias=pci108e,16a8 \
+    alias=pci14e4,0x1682 \
+    alias=pci14e4,0x1686 \
+    alias=pci14e4,0x16b0 \
+    alias=pci14e4,0x16b1 \
+    alias=pci14e4,0x16b2 \
+    alias=pci14e4,0x16b3 \
+    alias=pci14e4,0x16b4 \
+    alias=pci14e4,0x16b5 \
+    alias=pci14e4,0x16b6 \
+    alias=pci14e4,0x16b7 \
     alias=pci14e4,1645 \
     alias=pci14e4,1647 \
     alias=pci14e4,1648 \
@@ -118,6 +148,16 @@ $(sparc_ONLY)driver name=bge clone_perms="bge 0666 root sys" \
     alias=pci14e4,16a7 \
     alias=pci14e4,16a8 \
     alias=pci14e4,16c7 \
+    alias=pciex14e4,0x1682 \
+    alias=pciex14e4,0x1686 \
+    alias=pciex14e4,0x16b0 \
+    alias=pciex14e4,0x16b1 \
+    alias=pciex14e4,0x16b2 \
+    alias=pciex14e4,0x16b3 \
+    alias=pciex14e4,0x16b4 \
+    alias=pciex14e4,0x16b5 \
+    alias=pciex14e4,0x16b6 \
+    alias=pciex14e4,0x16b7 \
     alias=pciex14e4,1655 \
     alias=pciex14e4,1656 \
     alias=pciex14e4,1659 \
diff --git a/usr/src/pkg/manifests/driver-network-mlxcx.mf b/usr/src/pkg/manifests/driver-network-mlxcx.mf
index dec1aa726c..35c6634f0d 100644
--- a/usr/src/pkg/manifests/driver-network-mlxcx.mf
+++ b/usr/src/pkg/manifests/driver-network-mlxcx.mf
@@ -24,7 +24,7 @@ set name=pkg.fmri value=pkg:/driver/network/mlxcx@$(PKGVERS)
 set name=pkg.description value="Mellanox ConnectX-4/5/6 Ethernet Driver"
 set name=pkg.summary value="Mellanox ConnectX-4/5/6 Ethernet Driver"
 set name=info.classification \
-    value=org.opensolaris.category.2008:Drivers/Storage
+    value=org.opensolaris.category.2008:Drivers/Networking
 set name=variant.arch value=i386
 dir path=kernel group=sys
 dir path=kernel/drv group=sys
@@ -48,7 +48,5 @@ driver name=mlxcx \
 file path=kernel/drv/$(ARCH64)/mlxcx group=sys
 file path=kernel/drv/mlxcx.conf group=sys
 file path=usr/share/man/man7d/mlxcx.7d
-legacy pkg=SUNWmrsas desc="Mellanox ConnectX-4/5/6 Ethernet Driver" \
-    name="Mellanox ConnectX-4/5/6 Ethernet Driver"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/system-extended-system-utilities.mf b/usr/src/pkg/manifests/system-extended-system-utilities.mf
index 0a8502a491..ea58ec0d55 100644
--- a/usr/src/pkg/manifests/system-extended-system-utilities.mf
+++ b/usr/src/pkg/manifests/system-extended-system-utilities.mf
@@ -23,6 +23,7 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
 # Copyright 2016 RackTop Systems.
+# Copyright 2020 Joyent, Inc.
 #
 
 set name=pkg.fmri value=pkg:/system/extended-system-utilities@$(PKGVERS)
@@ -117,10 +118,10 @@ file path=usr/bin/lastcomm mode=0555
 file path=usr/bin/lgrpinfo mode=0555
 file path=usr/bin/look mode=0755
 file path=usr/bin/mkfifo mode=0555
-file path=usr/bin/nawk mode=0555
 file path=usr/bin/newform mode=0555
 file path=usr/bin/news mode=0555
 file path=usr/bin/nl mode=0555
+file path=usr/bin/oawk mode=0555
 file path=usr/bin/pack mode=0555
 file path=usr/bin/pginfo mode=0555
 file path=usr/bin/pgstat mode=0555
@@ -185,10 +186,10 @@ file path=usr/share/man/man1/lgrpinfo.1
 file path=usr/share/man/man1/look.1
 file path=usr/share/man/man1/madv.so.1.1
 file path=usr/share/man/man1/mpss.so.1.1
-file path=usr/share/man/man1/nawk.1
 file path=usr/share/man/man1/newform.1
 file path=usr/share/man/man1/news.1
 file path=usr/share/man/man1/nl.1
+file path=usr/share/man/man1/oawk.1
 file path=usr/share/man/man1/pack.1
 file path=usr/share/man/man1/pargs.1
 file path=usr/share/man/man1/plgrp.1
@@ -223,7 +224,7 @@ $(i386_ONLY)hardlink path=usr/bin/$(ARCH32)/penv \
     target=../../../usr/bin/$(ARCH32)/pargs
 hardlink path=usr/bin/$(ARCH64)/pauxv target=../../../usr/bin/$(ARCH64)/pargs
 hardlink path=usr/bin/$(ARCH64)/penv target=../../../usr/bin/$(ARCH64)/pargs
-hardlink path=usr/bin/oawk target=../../usr/bin/awk
+hardlink path=usr/bin/nawk target=../../usr/bin/awk
 hardlink path=usr/bin/pargs target=../../usr/lib/isaexec
 hardlink path=usr/bin/pauxv target=../../usr/lib/isaexec
 hardlink path=usr/bin/pcred target=../../usr/lib/isaexec
@@ -284,6 +285,7 @@ link path=usr/proc/bin/pwait target=../../bin/pwait
 link path=usr/proc/bin/pwdx target=../../bin/pwdx
 link path=usr/share/man/man1/hashcheck.1 target=spell.1
 link path=usr/share/man/man1/hashmake.1 target=spell.1
+link path=usr/share/man/man1/nawk.1 target=awk.1
 link path=usr/share/man/man1/pauxv.1 target=pargs.1
 link path=usr/share/man/man1/pcat.1 target=pack.1
 link path=usr/share/man/man1/penv.1 target=pargs.1