[illumos-gate merge]

commit c82c4676ac0cb87eb69c9444cf1a775e756ebbb9
    14496 git pbchk should look in .git/info for *.NOT files
commit 77ac03cbec412857d39c4898c9ed10abb6061418
    14291 cxgbe: asserts when requesting more queues than available
commit 311330e6823a3a919ff127757c2f0cf9eb17aa0e
    14539 bhyve: make clobber removes proto file
commit 29ed14768e5e76bb8c95f0a28b4d21d8741dfabe
    14436 "dladm show-overlay <overlay>" exits zero when varpd doesn't know about the overlay
commit bbf215553c7233fbab8a0afdf1fac74c44781867
    14443 resection manual pages per IPD4
commit 236cb9a89d936b4b681853751c9af1adccc35ef9
    14554 TSC calibration is the PITs

Conflicts:
    usr/src/cmd/bhyve/Makefile
    usr/src/cmd/dladm/dladm.c
    usr/src/cmd/svc/milestone/net-physical
    usr/src/cmd/svc/milestone/network-physical.xml
    usr/src/cmd/zoneadmd/zoneadmd.c
    usr/src/cmd/zonecfg/zonecfg.c
    usr/src/lib/libzonecfg/common/libzonecfg.c
    usr/src/man/man1/hostname.1
    usr/src/man/man1/zlogin.1
    usr/src/man/man4/Makefile
    usr/src/man/man4d/Makefile
    usr/src/man/man4d/cpuid.4d
    usr/src/man/man4fs/Makefile
    usr/src/man/man4i/Makefile
    usr/src/man/man4m/Makefile
    usr/src/man/man4p/vxlan.4p
    usr/src/man/man5/proc.5
    usr/src/man/man5/process.5
    usr/src/man/man7/Makefile
    usr/src/man/man7/privileges.7
    usr/src/man/man7/resource_controls.7
    usr/src/man/man8/Makefile
    usr/src/man/man8/connstat.8
    usr/src/man/man8/dladm.8
    usr/src/man/man8/dumpadm.8
    usr/src/man/man8/flowadm.8
    usr/src/man/man8/prstat.8
    usr/src/man/man8/reboot.8
    usr/src/man/man8/route.8
    usr/src/man/man8/savecore.8
    usr/src/man/man8/smbios.8
    usr/src/man/man8/snoop.8
    usr/src/man/man8/svc.startd.8
    usr/src/man/man8/tunefs.8
    usr/src/man/man8/zfs.8
    usr/src/man/man8/zoneadm.8
    usr/src/man/man8/zonecfg.8
    usr/src/man/man8/zpool.8
    usr/src/man/man9f/ddi_fm_init.9f
    usr/src/test/util-tests/tests/dladm/Makefile
    usr/src/test/util-tests/tests/dladm/show-overlay-exit.ksh

1 files changed, 5 insertions, 5 deletions

diff --git a/usr/src/tools/scripts/git-pbchk.1onbld b/usr/src/tools/scripts/git-pbchk.1onbld
index 5876caef63..a25fb4aa90 100644
--- a/usr/src/tools/scripts/git-pbchk.1onbld
+++ b/usr/src/tools/scripts/git-pbchk.1onbld
@@ -15,7 +15,7 @@
 .\" Copyright 2018 Joyent, Inc.
 .\"
 
-.TH "GIT\-PBCHK" "1ONBLD" "September 4, 2018" "" ""
+.TH "GIT\-PBCHK" "1ONBLD" "February 10, 2022" "" ""
 
 .SH "NAME"
 \fBgit\-pbchk\fR \- nits and pre\-putback checks for git
@@ -52,13 +52,13 @@ Check that each source file contains a copyright notice for the current
 year\. You don't need to fix this if you, the potential new copyright holder, chooses not to
 .TP
 C style [cstyle]
-Check that C source files conform to the Illumos C style rules
+Check that C source files conform to the illumos C style rules
 .TP
 Header check [hdrchk]
-Check that C header files conform to the Illumos header style rules (in addition to the general C rules)
+Check that C header files conform to the illumos header style rules (in addition to the general C rules)
 .TP
 Java style [jstyle]
-Check that Java source files conform to the Illumos Java style rules (which differ from the traditionally recommended Java style)
+Check that Java source files conform to the illumos Java style rules (which differ from the traditionally recommended Java style)
 .TP
 SCCS Keywords [keywords]
 Check that no source files contain unexpanded SCCS keywords\. It is possible that this check may false positive on certain inputs\. It is generally obvious when this is the case\.
@@ -77,7 +77,7 @@ Check for whitespace issues such as mixed tabs/spaces in source files.
 Exception lists can be used to exclude certain files from checking, named after
 the specific check.
 They can be found in \fB$CODEMGR_WS/exception_lists/\fR, or optionally under
-\fB$CODEMGR_WS/\.git/\fR, where they must be suffixed \fB.NOT\fR.
+\fB$CODEMGR_WS/\.git/info/\fR, where they must be suffixed \fB.NOT\fR.
 
 .IP "" 0