git: d1e652bf04bd - main - camcontrol.8: Fix a typo in the manual page

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=d1e652bf04bd94ed3469a5a2fcb6938b3f4dcbc0

commit d1e652bf04bd94ed3469a5a2fcb6938b3f4dcbc0
Author: Gordon Bergling 
AuthorDate: 2024-06-16 16:01:12 +
Commit: Gordon Bergling 
CommitDate: 2024-06-16 16:01:12 +

camcontrol.8: Fix a typo in the manual page

- s/emtpy/empty/

MFC after:  3 days
---
 sbin/camcontrol/camcontrol.8 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index bb206bf6ad85..bdda1828abf5 100644
--- a/sbin/camcontrol/camcontrol.8
+++ b/sbin/camcontrol/camcontrol.8
@@ -2330,7 +2330,7 @@ For the Report Zones command, specify a subset of zones 
to report.
 .It all
 Report all zones.
 This is the default.
-.It emtpy
+.It empty
 Report only empty zones.
 .It imp_open
 Report zones that are implicitly open.

git: 018a361f8902 - main - virtio(4): Fix two typos in KASSERT messages

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=018a361f8902d629fca64be372ef9b266fee53ba

commit 018a361f8902d629fca64be372ef9b266fee53ba
Author: Gordon Bergling 
AuthorDate: 2024-06-16 16:02:46 +
Commit: Gordon Bergling 
CommitDate: 2024-06-16 16:02:46 +

virtio(4): Fix two typos in KASSERT messages

- s/emtpy/empty/

MFC after:  5 days
---
 sys/dev/virtio/console/virtio_console.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/virtio/console/virtio_console.c 
b/sys/dev/virtio/console/virtio_console.c
index 4a3fb1e97e57..66433565ce25 100644
--- a/sys/dev/virtio/console/virtio_console.c
+++ b/sys/dev/virtio/console/virtio_console.c
@@ -978,7 +978,7 @@ vtcon_ctrl_poll(struct vtcon_softc *sc,
 */
VTCON_CTRL_TX_LOCK(sc);
KASSERT(virtqueue_empty(vq),
-   ("%s: virtqueue is not emtpy", __func__));
+   ("%s: virtqueue is not empty", __func__));
error = virtqueue_enqueue(vq, control, &sg, sg.sg_nseg, 0);
if (error == 0) {
virtqueue_notify(vq);
@@ -1366,7 +1366,7 @@ vtcon_port_out(struct vtcon_port *port, void *buf, int 
bufsize)
 
vq = port->vtcport_outvq;
KASSERT(virtqueue_empty(vq),
-   ("%s: port %p out virtqueue not emtpy", __func__, port));
+   ("%s: port %p out virtqueue not empty", __func__, port));
 
sglist_init(&sg, 2, segs);
error = sglist_append(&sg, buf, bufsize);

git: 16c3d7e1fa15 - main - erf.3: Add a STANDARDS section

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=16c3d7e1fa150ee136b910448cf431e8deab5293

commit 16c3d7e1fa150ee136b910448cf431e8deab5293
Author: Gordon Bergling 
AuthorDate: 2024-06-23 10:50:47 +
Commit: Gordon Bergling 
CommitDate: 2024-06-23 10:50:47 +

erf.3: Add a STANDARDS section

Add a STANDARDS section for the erf(3) manual page.

PR: 273413
Reviewed by:pauamma_gundo.com
MFC after:  1 week
Differential Revision:  https://reviews.freebsd.org/D44140
---
 lib/msun/man/erf.3 | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/msun/man/erf.3 b/lib/msun/man/erf.3
index d5be06036ce9..8d66017ed11c 100644
--- a/lib/msun/man/erf.3
+++ b/lib/msun/man/erf.3
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd July 13, 2014
+.Dd June 23, 2024
 .Dt ERF 3
 .Os
 .Sh NAME
@@ -86,6 +86,17 @@ subtracts the result of the error function
 from 1.0.
 .Sh SEE ALSO
 .Xr math 3
+.Sh STANDARDS
+The
+.Fn erf ,
+.Fn erff ,
+.Fn erfl ,
+.Fn erfc ,
+.Fn erfcf
+and
+.Fn erfcl
+functions conform to
+.St -isoC-99 .
 .Sh HISTORY
 The
 .Fn erf

git: a9d7f098b865 - main - mps(4): Correct a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=a9d7f098b86576006f5aeb312521bfde5ac77c77

commit a9d7f098b86576006f5aeb312521bfde5ac77c77
Author: Gordon Bergling 
AuthorDate: 2024-07-06 17:49:30 +
Commit: Gordon Bergling 
CommitDate: 2024-07-06 17:49:30 +

mps(4): Correct a typo in a source code comment

- s/vender/vendor/

MFC after:  3 days
---
 sys/dev/mps/mps_pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/mps/mps_pci.c b/sys/dev/mps/mps_pci.c
index ece49435b39e..7a0c577eb72a 100644
--- a/sys/dev/mps/mps_pci.c
+++ b/sys/dev/mps/mps_pci.c
@@ -122,8 +122,8 @@ struct mps_ident {
0x, 0x, 0, "Avago Technologies (LSI) SAS2208" },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_1,
0x, 0x, 0, "Avago Technologies (LSI) SAS2308" },
-   // Add Customer specific vender/subdevice id before generic
-   // (0x) vender/subdevice id.
+   // Add Customer specific vendor/subdevice id before generic
+   // (0x) vendor/subdevice id.
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_2,
0x8086, 0x3516, 0, "Intel(R) Integrated RAID Module RMS25JB080" },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2308_2,

git: 6ea81bcaf8ad - main - ocs_fc(4): Fix a typo in a kernel message

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=6ea81bcaf8adcf6a8546407e93e97f3d920396d2

commit 6ea81bcaf8adcf6a8546407e93e97f3d920396d2
Author: Gordon Bergling 
AuthorDate: 2024-07-07 14:17:23 +
Commit: Gordon Bergling 
CommitDate: 2024-07-07 14:17:23 +

ocs_fc(4): Fix a typo in a kernel message

- s/elasped/elapsed/

MFC after:  5 days
---
 sys/dev/ocs_fc/ocs_hw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/ocs_fc/ocs_hw.c b/sys/dev/ocs_fc/ocs_hw.c
index cfb9d4f8f536..c368e09aef8c 100644
--- a/sys/dev/ocs_fc/ocs_hw.c
+++ b/sys/dev/ocs_fc/ocs_hw.c
@@ -11214,7 +11214,7 @@ target_wqe_timer_nop_cb(ocs_hw_t *hw, int32_t status, 
uint8_t *mqe, void *arg)
getmicrouptime(&cur_time);
timevalsub(&cur_time, &io->submit_time);
if (cur_time.tv_sec > io->wqe_timeout) {
-   ocs_log_info(hw->os, "IO timeout xri=0x%x tag=0x%x 
type=%d elasped time:%u\n",
+   ocs_log_info(hw->os, "IO timeout xri=0x%x tag=0x%x 
type=%d elapsed time:%u\n",
 io->indicator, io->reqtag, io->type, 
cur_time.tv_sec);
 
/* remove from active_wqe list so won't try to abort 
again */

git: 58c99e07506e - main - sctp(4): Fix typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=58c99e07506e67c06d703b080c2fc22cc39237f2

commit 58c99e07506e67c06d703b080c2fc22cc39237f2
Author: Gordon Bergling 
AuthorDate: 2024-07-21 08:57:22 +
Commit: Gordon Bergling 
CommitDate: 2024-07-21 08:57:22 +

sctp(4): Fix typos in source code comments

- s/collasped/collapsed/
- s/defininitions/definitions/
- s/optionaly/optionally/

Obtained from:  NetBSD
MFC after:  3 days
---
 sys/netinet6/sctp6_usrreq.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c
index e3ed37b53425..0f194821ea94 100644
--- a/sys/netinet6/sctp6_usrreq.c
+++ b/sys/netinet6/sctp6_usrreq.c
@@ -359,7 +359,7 @@ sctp6_ctlinput(struct ip6ctlparam *ip6cp)
 }
 
 /*
- * this routine can probably be collasped into the one in sctp_userreq.c
+ * this routine can probably be collapsed into the one in sctp_userreq.c
  * since they do the same thing and now we lookup with a sockaddr
  */
 static int
@@ -721,8 +721,8 @@ connected_type:
 * note with the current version this code will only be used
 * by OpenBSD, NetBSD and FreeBSD have methods for
 * re-defining sosend() to use sctp_sosend().  One can
-* optionaly switch back to this code (by changing back the
-* defininitions but this is not advisable.
+* optionally switch back to this code (by changing back the
+* definitions but this is not advisable.
 */
struct epoch_tracker et;
int ret;

git: 32a9b95a8751 - main - stress2: Fix a typo in namecache2.sh

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=32a9b95a8751f916deef5970476f010995244bfe

commit 32a9b95a8751f916deef5970476f010995244bfe
Author: Gordon Bergling 
AuthorDate: 2024-07-21 09:00:58 +
Commit: Gordon Bergling 
CommitDate: 2024-07-21 09:00:58 +

stress2: Fix a typo in namecache2.sh

- s/inconsistancy/inconsistency/

MFC after:  3 days
---
 tools/test/stress2/misc/namecache2.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/test/stress2/misc/namecache2.sh 
b/tools/test/stress2/misc/namecache2.sh
index 9fcfe5e0226c..b32d41974468 100755
--- a/tools/test/stress2/misc/namecache2.sh
+++ b/tools/test/stress2/misc/namecache2.sh
@@ -26,7 +26,7 @@
 # SUCH DAMAGE.
 #
 
-# UFS cache inconsistancy for rename(2) demonstrated
+# UFS cache inconsistency for rename(2) demonstrated
 # Fails with:
 #ls -ali /mnt
 #ls: tfa1022: No such file or directory

git: c90a206496fc - main - ipfilter(4): Fix typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=c90a206496fc431854e0c2989c2214b048e960d5

commit c90a206496fc431854e0c2989c2214b048e960d5
Author: Gordon Bergling 
AuthorDate: 2024-07-21 09:02:31 +
Commit: Gordon Bergling 
CommitDate: 2024-07-21 09:02:31 +

ipfilter(4): Fix typos in source code comments

- s/inconsistancy/inconsistency/

MFC after:  3 days
---
 sys/netpfil/ipfilter/netinet/mlfk_ipl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c 
b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c
index 69be4abb2485..1c3051fb6615 100644
--- a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c
+++ b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c
@@ -536,7 +536,7 @@ ipfclose(dev_t dev, int flags)
 /*
  * ipfread/ipflog
  * both of these must operate with at least splnet() lest they be
- * called during packet processing and cause an inconsistancy to appear in
+ * called during packet processing and cause an inconsistency to appear in
  * the filter lists.
  */
 #ifdef __FreeBSD__
@@ -579,7 +579,7 @@ static int ipfread(dev, uio, ioflag)
 /*
  * ipfwrite
  * both of these must operate with at least splnet() lest they be
- * called during packet processing and cause an inconsistancy to appear in
+ * called during packet processing and cause an inconsistency to appear in
  * the filter lists.
  */
 #ifdef __FreeBSD__

git: 619c9488a31c - main - axgbe: Fix two typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=619c9488a31ce14c6570d2e31f70d416382ed7a6

commit 619c9488a31ce14c6570d2e31f70d416382ed7a6
Author: Gordon Bergling 
AuthorDate: 2024-07-21 09:06:07 +
Commit: Gordon Bergling 
CommitDate: 2024-07-21 09:06:07 +

axgbe: Fix two typos in source code comments

- s/specfied/specified/

MFC after:  3 days
---
 sys/dev/axgbe/xgbe-phy-v2.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/axgbe/xgbe-phy-v2.c b/sys/dev/axgbe/xgbe-phy-v2.c
index d08ed118a8a8..5b39d61694e6 100644
--- a/sys/dev/axgbe/xgbe-phy-v2.c
+++ b/sys/dev/axgbe/xgbe-phy-v2.c
@@ -500,7 +500,7 @@ xgbe_phy_i2c_write(struct xgbe_prv_data *pdata, unsigned 
int target, void *val,
 
retry = 1;
 again:
-   /* Write the specfied register */
+   /* Write the specified register */
i2c_op.cmd = XGBE_I2C_CMD_WRITE;
i2c_op.target = target;
i2c_op.len = val_len;
@@ -539,7 +539,7 @@ again1:
 
retry = 1;
 again2:
-   /* Read the specfied register */
+   /* Read the specified register */
i2c_op.cmd = XGBE_I2C_CMD_READ;
i2c_op.target = target;
i2c_op.len = val_len;

git: 38cc6c3d95d4 - main - atrtc(4): Fix a typo in a sysctl description

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=38cc6c3d95d4d1156960a9c5ba69c360e36f9976

commit 38cc6c3d95d4d1156960a9c5ba69c360e36f9976
Author: Gordon Bergling 
AuthorDate: 2024-04-12 12:32:48 +
Commit: Gordon Bergling 
CommitDate: 2024-04-12 12:32:48 +

atrtc(4): Fix a typo in a sysctl description

- s/emtpy/empty/

MFC after:  5 days
---
 sys/x86/isa/atrtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/x86/isa/atrtc.c b/sys/x86/isa/atrtc.c
index 7c42cc28566e..df0acdd499be 100644
--- a/sys/x86/isa/atrtc.c
+++ b/sys/x86/isa/atrtc.c
@@ -62,7 +62,7 @@
 /* tunable to detect a power loss of the rtc */
 static bool atrtc_power_lost = false;
 SYSCTL_BOOL(_machdep, OID_AUTO, atrtc_power_lost, CTLFLAG_RD, 
&atrtc_power_lost,
-false, "RTC lost power on last power cycle (probably caused by an emtpy 
cmos battery)");
+false, "RTC lost power on last power cycle (probably caused by an empty 
cmos battery)");
 
 /*
  * atrtc_lock protects low-level access to individual hardware registers.

git: 8ce3ef5f35fd - main - netpfil: Fix typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=8ce3ef5f35fd4dc442b1a33605ca7d3132047faf

commit 8ce3ef5f35fd4dc442b1a33605ca7d3132047faf
Author: Gordon Bergling 
AuthorDate: 2024-04-18 14:17:10 +
Commit: Gordon Bergling 
CommitDate: 2024-04-18 14:17:10 +

netpfil: Fix typos in source code comments

- s/addres/address/

MFC after:  3 days
---
 sys/netpfil/ipfilter/netinet/ip_fil.h | 4 ++--
 sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c | 2 +-
 sys/netpfil/pf/pf.c   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/netpfil/ipfilter/netinet/ip_fil.h 
b/sys/netpfil/ipfilter/netinet/ip_fil.h
index 909cdd8870e1..aa3d1de422db 100644
--- a/sys/netpfil/ipfilter/netinet/ip_fil.h
+++ b/sys/netpfil/ipfilter/netinet/ip_fil.h
@@ -591,8 +591,8 @@ typedef struct  fripf   {
u_short fri_icmp;
 
frtuc_t fri_tuc;
-   fr_atypes_t fri_satype; /* addres type */
-   fr_atypes_t fri_datype; /* addres type */
+   fr_atypes_t fri_satype; /* address type */
+   fr_atypes_t fri_datype; /* address type */
int fri_sifpidx;/* doing dynamic addressing */
int fri_difpidx;/* index into fr_ifps[] to use when */
 } fripf_t;
diff --git a/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c 
b/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c
index 8f1ee3d8d05f..3bc74247251a 100644
--- a/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c
+++ b/sys/netpfil/ipfilter/netinet/ip_ftp_pxy.c
@@ -1834,7 +1834,7 @@ ipf_p_ftp_epsv(ipf_ftp_softc_t *softf, fr_info_t *fin, 
ip_t *ip, nat_t *nat,
s++;
 
/*
-* As per RFC 2428, there are no addres components in the EPSV
+* As per RFC 2428, there are no address components in the EPSV
 * response.  So we'll go straight to getting the port.
 */
while (*s && ISDIGIT(*s)) {
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index 4cec0936539e..cbf5ebfc0e56 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -6196,7 +6196,7 @@ again:
break;
}
 
-   /* Only add the addres if we've actually allowed the 
state. */
+   /* Only add the address if we've actually allowed the 
state. */
pf_sctp_multihome_add_addr(pd, &j->src, v_tag);
 
if (! do_extra) {

git: 046fe202e766 - main - muge(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=046fe202e76623988ac612b20047940b86dd373f

commit 046fe202e76623988ac612b20047940b86dd373f
Author: Gordon Bergling 
AuthorDate: 2024-04-18 14:18:26 +
Commit: Gordon Bergling 
CommitDate: 2024-04-18 14:18:26 +

muge(4): Fix a typo in a source code comment

- s/addres/address/

MFC after:  3 days
---
 sys/dev/usb/net/if_muge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/usb/net/if_muge.c b/sys/dev/usb/net/if_muge.c
index 0337d6ddbe18..dd4a89aa8b05 100644
--- a/sys/dev/usb/net/if_muge.c
+++ b/sys/dev/usb/net/if_muge.c
@@ -1811,7 +1811,7 @@ done:
  * muge_multicast_write
  * @sc: device's soft context
  *
- * Writes perfect addres filters and hash address filters to their
+ * Writes perfect address filters and hash address filters to their
  * corresponding registers and RAMs.
  *
  */

git: e991acd5d0f6 - main - oce(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e991acd5d0f60fe3c57acb452003c551194a758b

commit e991acd5d0f60fe3c57acb452003c551194a758b
Author: Gordon Bergling 
AuthorDate: 2024-04-18 14:19:18 +
Commit: Gordon Bergling 
CommitDate: 2024-04-18 14:19:18 +

oce(4): Fix a typo in a source code comment

- s/addres/address/

MFC after:  3 days
---
 sys/dev/oce/oce_mbox.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/oce/oce_mbox.c b/sys/dev/oce/oce_mbox.c
index 3717eb91d36b..a51798119761 100644
--- a/sys/dev/oce/oce_mbox.c
+++ b/sys/dev/oce/oce_mbox.c
@@ -471,7 +471,7 @@ oce_read_mac_addr(POCE_SOFTC sc, uint32_t if_id,
goto error;
}
 
-   /* copy the mac addres in the output parameter */
+   /* copy the mac address in the output parameter */
mac->size_of_struct = fwcmd->params.rsp.mac.size_of_struct;
bcopy(&fwcmd->params.rsp.mac.mac_addr[0], &mac->mac_addr[0],
mac->size_of_struct);

git: 178cf4b9db4b - main - arm: Fix a typo in a KASSERT message

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=178cf4b9db4bb6726e845b10923788cf4e7a5ef0

commit 178cf4b9db4bb6726e845b10923788cf4e7a5ef0
Author: Gordon Bergling 
AuthorDate: 2024-04-19 06:54:39 +
Commit: Gordon Bergling 
CommitDate: 2024-04-19 06:54:39 +

arm: Fix a typo in a KASSERT message

- s/resoure/resource/

MFC after:  5 days
---
 sys/arm/arm/gic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c
index cb1419c42569..7fbf7e7fd827 100644
--- a/sys/arm/arm/gic.c
+++ b/sys/arm/arm/gic.c
@@ -444,7 +444,7 @@ arm_gic_alloc_resource(device_t bus, device_t child, int 
type, int *rid,
struct resource_list *rl;
int j;
 
-   KASSERT(type == SYS_RES_MEMORY, ("Invalid resoure type %x", type));
+   KASSERT(type == SYS_RES_MEMORY, ("Invalid resource type %x", type));
 
sc = device_get_softc(bus);
 

git: 8993d785a261 - main - expand.1: Fix markup for the '-t' option

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=8993d785a261ee92528b44dae5a629ce389de412

commit 8993d785a261ee92528b44dae5a629ce389de412
Author: Gordon Bergling 
AuthorDate: 2024-04-19 15:39:37 +
Commit: Gordon Bergling 
CommitDate: 2024-04-19 15:39:37 +

expand.1: Fix markup for the '-t' option

When viewing the manpage the '-t' option is shown as follows

-t -Sm tab1, tab2, ..., tabn Sm

with the markup '\&Sm' included within '.It Fl t', which doesn't
makes any sense.

So just remove it.

PR: 274897
MFC after:  3 days
---
 usr.bin/expand/expand.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 06a2ad2e6132..e63d9d7c1e03 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -78,7 +78,7 @@ If the
 .Fl a
 option is given, then tabs are inserted whenever they would compress the
 resultant file by replacing two or more characters.
-.It Fl t \&Sm Ar tab1 , tab2 , ... , tabn \&Sm
+.It Fl t Ar tab1 , tab2 , ... , tabn
 Set tab stops at column positions
 .Ar tab1 , tab2 , ... , tabn .
 If only a single number is given, tab stops are set that number of

git: 5235e9d646e7 - main - binmiscctl.8: Remove a double word

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=5235e9d646e7771cc532b8fc02f742a8157a41e5

commit 5235e9d646e7771cc532b8fc02f742a8157a41e5
Author: Gordon Bergling 
AuthorDate: 2024-04-20 09:15:20 +
Commit: Gordon Bergling 
CommitDate: 2024-04-20 09:15:20 +

binmiscctl.8: Remove a double word

- s/the the/the/

MFC after:  3 days
---
 usr.sbin/binmiscctl/binmiscctl.8 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/binmiscctl/binmiscctl.8 b/usr.sbin/binmiscctl/binmiscctl.8
index 36b69f5d3375..178389920448 100644
--- a/usr.sbin/binmiscctl/binmiscctl.8
+++ b/usr.sbin/binmiscctl/binmiscctl.8
@@ -128,7 +128,7 @@ To make the interpreter automatically available in jails 
and chroots,
 use the
 .Fl -pre-open
 option to allow the kernel to open the binary at configuration time
-rather then lazily when the the interpreted program is started.
+rather then lazily when the interpreted program is started.
 .Pp
 The interpreter
 .Ar path

git: 6573ce292fc5 - main - nvmecontrol(8): Remove a double word in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=6573ce292fc5ddc6c846860b3fa98473e3f5d1c6

commit 6573ce292fc5ddc6c846860b3fa98473e3f5d1c6
Author: Gordon Bergling 
AuthorDate: 2024-04-20 09:18:59 +
Commit: Gordon Bergling 
CommitDate: 2024-04-20 09:18:59 +

nvmecontrol(8): Remove a double word in a source code comment

- s/the the/the/

MFC after:  3 days
---
 sbin/nvmecontrol/nvmecontrol.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sbin/nvmecontrol/nvmecontrol.h b/sbin/nvmecontrol/nvmecontrol.h
index 2ce4ad4c5c2b..394a88608692 100644
--- a/sbin/nvmecontrol/nvmecontrol.h
+++ b/sbin/nvmecontrol/nvmecontrol.h
@@ -96,7 +96,7 @@ void print_intel_add_smart(const struct nvme_controller_data 
*cdata __unused, vo
  * this. Older compilers will support 128-bit ints on 64-bit
  * platforms. Otherwise we truncate this to 64-bit on 32-bit systems with older
  * compilers. We also check for > C18 instead of >= C23 because clang 17 was
- * released before the the __STDC_VERSION__ was defined.
+ * released before the __STDC_VERSION__ was defined.
  */
 #define UINT128_DIG39
 #if __STDC_VERSION__ >= 202311L

git: 742f4b77583c - main - tarfs(5): Grammar fix for a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=742f4b77583c12ad31edfb3d6f7173f37bd0e88c

commit 742f4b77583c12ad31edfb3d6f7173f37bd0e88c
Author: Gordon Bergling 
AuthorDate: 2024-04-20 09:21:54 +
Commit: Gordon Bergling 
CommitDate: 2024-04-20 09:21:54 +

tarfs(5): Grammar fix for a source code comment

- s/the the/of the/

MFC after:i 3 days
---
 sys/fs/tarfs/tarfs_vnops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/fs/tarfs/tarfs_vnops.c b/sys/fs/tarfs/tarfs_vnops.c
index f2828c60f8a7..8c97fab185fc 100644
--- a/sys/fs/tarfs/tarfs_vnops.c
+++ b/sys/fs/tarfs/tarfs_vnops.c
@@ -296,7 +296,7 @@ tarfs_lookup(struct vop_cachedlookup_args *ap)
*vpp, tnp);
 #endif /* TARFS_DEBUG */
 
-   /* Store the result the the cache if MAKEENTRY is specified in flags */
+   /* Store the result of the cache if MAKEENTRY is specified in flags */
if ((cnp->cn_flags & MAKEENTRY) != 0 && cnp->cn_nameiop != CREATE)
cache_enter(dvp, *vpp, cnp);
 

git: bbef63ec27fd - main - timerfd.2: Remove a double word

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=bbef63ec27fdb86814e34c4b4013cd92ba86bc42

commit bbef63ec27fdb86814e34c4b4013cd92ba86bc42
Author: Gordon Bergling 
AuthorDate: 2024-04-20 09:31:25 +
Commit: Gordon Bergling 
CommitDate: 2024-04-20 09:31:25 +

timerfd.2: Remove a double word

- s/is is/is/

MFC after:  3 days
---
 lib/libsys/timerfd.2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libsys/timerfd.2 b/lib/libsys/timerfd.2
index e5dab05821bd..7a112ad0dfcb 100644
--- a/lib/libsys/timerfd.2
+++ b/lib/libsys/timerfd.2
@@ -300,7 +300,7 @@ object fails if:
 .It Bq Er EAGAIN
 The timer's expiration counter is zero and the
 .Nm
-object is is set for non-blocking I/O.
+object is set for non-blocking I/O.
 .It Bq Er ECANCELED
 The timer was created with the clock ID
 .Dv CLOCK_REALTIME ,

git: 68b9eb9185f5 - main - ifconfig(8): Fix two typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=68b9eb9185f5569d05b5fecb178048f00c3b5c1a

commit 68b9eb9185f5569d05b5fecb178048f00c3b5c1a
Author: Gordon Bergling 
AuthorDate: 2024-04-20 12:01:23 +
Commit: Gordon Bergling 
CommitDate: 2024-04-20 12:01:23 +

ifconfig(8): Fix two typos in source code comments

- s/the the/the/

MFC after:  3 days
---
 sbin/ifconfig/ifieee80211.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index bde079deb4c6..c6875785f8f5 100644
--- a/sbin/ifconfig/ifieee80211.c
+++ b/sbin/ifconfig/ifieee80211.c
@@ -2784,7 +2784,7 @@ printvhtcap(if_ctx *ctx, const char *tag, const u_int8_t 
*ie)
const struct ieee80211_vht_cap *vhtcap;
uint32_t vhtcap_info;
 
-   /* Check that the the right size. */
+   /* Check that the right size. */
if (ie[1] != sizeof(*vhtcap)) {
printf("");
return;
@@ -2814,7 +2814,7 @@ printvhtinfo(if_ctx *ctx, const char *tag, const u_int8_t 
*ie)
if (ctx->args->verbose) {
const struct ieee80211_vht_operation *vhtinfo;
 
-   /* Check that the the right size. */
+   /* Check that the right size. */
if (ie[1] != sizeof(*vhtinfo)) {
printf("");
return;

git: e1e149ad8ada - main - mwlstats: Fix a typo in an error message

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e1e149ad8ada85267e981cb9d4c6b48d4ce9e1f4

commit e1e149ad8ada85267e981cb9d4c6b48d4ce9e1f4
Author: Gordon Bergling 
AuthorDate: 2024-04-20 12:02:54 +
Commit: Gordon Bergling 
CommitDate: 2024-04-20 12:02:54 +

mwlstats: Fix a typo in an error message

- s/the the/the/

MFC after:  5 days
---
 tools/tools/mwl/mwlstats/mwlstats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/tools/mwl/mwlstats/mwlstats.c 
b/tools/tools/mwl/mwlstats/mwlstats.c
index 925ed62de716..c9f6fe1ada2b 100644
--- a/tools/tools/mwl/mwlstats/mwlstats.c
+++ b/tools/tools/mwl/mwlstats/mwlstats.c
@@ -126,7 +126,7 @@ static const struct fmt mwlstats[] = {
 #defineS_RX_FRAGERROR  AFTER(S_RX_OVERFLOW)
{ 6,"rxfrag",   "rxfrag",   "rx failed in f/w due to 
defrag" },
 #defineS_RX_MEMERROR   AFTER(S_RX_FRAGERROR)
-   { 5,"rxmem","rxmem","rx failed in f/w 'cuz out of 
of memory" },
+   { 5,"rxmem","rxmem","rx failed in f/w 'cuz out of 
memory" },
 #defineS_PTRERROR  AFTER(S_RX_MEMERROR)
{ 6,"badptr",   "badptr",   "MAC internal pointer problem" 
},
 #defineS_TX_UNDERFLOW  AFTER(S_PTRERROR)

git: cf5d9c41246c - main - sys: Remove two double words in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=cf5d9c41246c0583b28d5c1101c6f334e38a67e9

commit cf5d9c41246c0583b28d5c1101c6f334e38a67e9
Author: Gordon Bergling 
AuthorDate: 2024-04-20 12:04:31 +
Commit: Gordon Bergling 
CommitDate: 2024-04-20 12:04:31 +

sys: Remove two double words in source code comments

- s/of of/of/

MFC after:  5 days
---
 sys/sys/link_elf.h | 2 +-
 sys/sys/types.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h
index 2ef044032f58..9752bdff55dc 100644
--- a/sys/sys/link_elf.h
+++ b/sys/sys/link_elf.h
@@ -58,7 +58,7 @@ typedef struct link_map {
caddr_t l_base; /* Base Address of library */
const char  *l_name;/* Absolute Path to Library */
const void  *l_ld;  /* Pointer to .dynamic in 
memory */
-   struct link_map *l_next, *l_prev;   /* linked list of of mapped 
libs */
+   struct link_map *l_next, *l_prev;   /* linked list of mapped libs */
caddr_t l_addr; /* Load Offset of library */
const char  *l_refname; /* object we are filtering for 
*/
 } Link_map;
diff --git a/sys/sys/types.h b/sys/sys/types.h
index 608e74287487..129ca0f2f4c4 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -317,7 +317,7 @@ typedef _Bool   bool;
  * The major and minor numbers are encoded in dev_t as MMMmmmMm (where
  * letters correspond to bytes).  The encoding of the lower 4 bytes is
  * constrained by compatibility with 16-bit and 32-bit dev_t's.  The
- * encoding of of the upper 4 bytes is the least unnatural one consistent
+ * encoding of the upper 4 bytes is the least unnatural one consistent
  * with this and other constraints.  Also, the decoding of the m bytes by
  * minor() is unnatural to maximize compatibility subject to not discarding
  * bits.  The upper m byte is shifted into the position of the lower M byte

git: 516e591db11a - main - arm64: Remove a double word in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=516e591db11a29c7bb3d8135a94530b27b94f91d

commit 516e591db11a29c7bb3d8135a94530b27b94f91d
Author: Gordon Bergling 
AuthorDate: 2024-04-20 12:06:53 +
Commit: Gordon Bergling 
CommitDate: 2024-04-20 12:06:53 +

arm64: Remove a double word in a source code comment

- s/of of/of/

MFC after:  3 days
---
 sys/arm64/qoriq/qoriq_dw_pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/arm64/qoriq/qoriq_dw_pci.c b/sys/arm64/qoriq/qoriq_dw_pci.c
index ca67b5d9cbc6..2d7de343564a 100644
--- a/sys/arm64/qoriq/qoriq_dw_pci.c
+++ b/sys/arm64/qoriq/qoriq_dw_pci.c
@@ -60,7 +60,7 @@
 
 struct qoriq_dw_pci_cfg {
uint32_tpex_pf0_dgb;/* offset of PEX_PF0_DBG register */
-   uint32_tltssm_bit;  /* LSB bit of of LTSSM state field */
+   uint32_tltssm_bit;  /* LSB bit of LTSSM state field */
 };
 
 struct qorif_dw_pci_softc {

git: 1ff65c57e337 - main - NOTES: Remove a double word in comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=1ff65c57e337ddb1681af5f98da0fa757cefc5ad

commit 1ff65c57e337ddb1681af5f98da0fa757cefc5ad
Author: Gordon Bergling 
AuthorDate: 2024-04-20 12:08:04 +
Commit: Gordon Bergling 
CommitDate: 2024-04-20 12:08:04 +

NOTES: Remove a double word in comment

- s/of of/of/

MFC after:  3 days
---
 sys/conf/NOTES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 4280d477bcb5..cdeee4eb7fd6 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2803,7 +2803,7 @@ options   MAXFILES=999
 optionsRANDOM_ENABLE_UMA   # slab allocator
 
 # Select this to allow high-rate but potentially expensive
-# harvesting of of the m_next pointer in the mbuf. Note that
+# harvesting of the m_next pointer in the mbuf. Note that
 # the m_next pointer is NULL except when receiving > 4K
 # jumbo frames or sustained bursts by way of LRO. Thus in
 # the common case it is stirring zero in to the entropy

git: d2747968c068 - main - bhnd(4): Remove a double word in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=d2747968c068b8cfc890901f4955037bad7adb9a

commit d2747968c068b8cfc890901f4955037bad7adb9a
Author: Gordon Bergling 
AuthorDate: 2024-04-20 12:09:18 +
Commit: Gordon Bergling 
CommitDate: 2024-04-20 12:09:18 +

bhnd(4): Remove a double word in a source code comment

- s/of of/of/

MFC after:  3 days
---
 sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c 
b/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c
index cdb92551e887..5467bcbaac20 100644
--- a/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c
+++ b/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c
@@ -56,7 +56,7 @@
  * The Broadcom NVRAM NUL-delimited ASCII format is used by most
  * Broadcom SoCs.
  * 
- * The NVRAM data is encoded as a stream of of NUL-terminated 'key=value'
+ * The NVRAM data is encoded as a stream of NUL-terminated 'key=value'
  * strings; the end of the stream is denoted by a single extra NUL character.
  */
 

git: 604511f84ae6 - main - usb(4): Remove a double word in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=604511f84ae6378db25ae3080e9db2e3bc9e0811

commit 604511f84ae6378db25ae3080e9db2e3bc9e0811
Author: Gordon Bergling 
AuthorDate: 2024-04-20 12:10:59 +
Commit: Gordon Bergling 
CommitDate: 2024-04-20 12:10:59 +

usb(4): Remove a double word in a source code comment

- s/of of/of/

MFC after:  3 days
---
 sys/dev/usb/usb_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c
index a4355de237c5..c4fe3b4a6ab6 100644
--- a/sys/dev/usb/usb_device.c
+++ b/sys/dev/usb/usb_device.c
@@ -2484,7 +2484,7 @@ usb_devinfo(struct usb_device *udev, char *dst_ptr, 
uint16_t dst_len)
 
 #ifdef USB_VERBOSE
 /*
- * Descriptions of of known vendors and devices ("products").
+ * Descriptions of known vendors and devices ("products").
  */
 struct usb_knowndev {
uint16_t vendor;

git: 1bbdcf62d3ac - main - safe(4): Remove a double word in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=1bbdcf62d3ac8fbea2d4c5b37ccd9ac2032d37d7

commit 1bbdcf62d3ac8fbea2d4c5b37ccd9ac2032d37d7
Author: Gordon Bergling 
AuthorDate: 2024-04-20 12:12:23 +
Commit: Gordon Bergling 
CommitDate: 2024-04-20 12:12:23 +

safe(4): Remove a double word in a source code comment

- s/of of/of/

MFC after:  3 days
---
 sys/dev/safe/safe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c
index bafee29b9a9a..da2afbd38fad 100644
--- a/sys/dev/safe/safe.c
+++ b/sys/dev/safe/safe.c
@@ -1777,7 +1777,7 @@ safe_dmamap_aligned(const struct safe_operand *op)
  * of an operation.  The hardware requires that each ``particle''
  * but the last in an operation result have the same size.  We
  * fix that size at SAFE_MAX_DSIZE bytes.  This routine returns
- * 0 if some segment is not a multiple of of this size, 1 if all
+ * 0 if some segment is not a multiple of this size, 1 if all
  * segments are exactly this size, or 2 if segments are at worst
  * a multiple of this size.
  */

git: e6c45f377d5b - main - i386: Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e6c45f377d5b3bc28fc51a67c40dfa45c2087895

commit e6c45f377d5b3bc28fc51a67c40dfa45c2087895
Author: Gordon Bergling 
AuthorDate: 2024-04-20 12:13:33 +
Commit: Gordon Bergling 
CommitDate: 2024-04-20 12:13:33 +

i386: Fix a typo in a source code comment

- s/slighly/slightly/

MFC after:  1 week
---
 sys/i386/include/atomic.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h
index dae829b2c0f6..5aca9fb15181 100644
--- a/sys/i386/include/atomic.h
+++ b/sys/i386/include/atomic.h
@@ -91,7 +91,7 @@ __mbu(void)
  */
 
 /*
- * Always use lock prefixes.  The result is slighly less optimal for
+ * Always use lock prefixes.  The result is slightly less optimal for
  * UP systems, but it matters less now, and sometimes UP is emulated
  * over SMP.
  *

git: fa3b320668ba - main - ds1307(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=fa3b320668ba606801433705dbd39ac8dfb6

commit fa3b320668ba606801433705dbd39ac8dfb6
Author: Gordon Bergling 
AuthorDate: 2024-04-20 12:14:21 +
Commit: Gordon Bergling 
CommitDate: 2024-04-20 12:14:21 +

ds1307(4): Fix a typo in a source code comment

- s/slighly/slightly/

MFC after:  1 week
---
 sys/dev/iicbus/rtc/ds1307.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/iicbus/rtc/ds1307.c b/sys/dev/iicbus/rtc/ds1307.c
index bf247b618c2c..e8aa6a258edc 100644
--- a/sys/dev/iicbus/rtc/ds1307.c
+++ b/sys/dev/iicbus/rtc/ds1307.c
@@ -471,7 +471,7 @@ ds1307_gettime(device_t dev, struct timespec *ts)
/*
 * If the chip is in AM/PM mode remember that.
 * The EPSON uses a 1 to signify 24 hour mode, while the DS uses a 0,
-* in slighly different positions.
+* in slightly different positions.
 */
if (sc->chiptype == TYPE_EPSON_RX8035)
ampm_mode = !(data[DS1307_HOUR] & RX8035_HOUR_USE_24);

git: 8b5c5cae92d5 - main - vmm(4): Fix a typo in a kernel message

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=8b5c5cae92d5b44f03636540a787fd6e994ce816

commit 8b5c5cae92d5b44f03636540a787fd6e994ce816
Author: Gordon Bergling 
AuthorDate: 2024-04-21 07:44:18 +
Commit: Gordon Bergling 
CommitDate: 2024-04-21 07:44:18 +

vmm(4): Fix a typo in a kernel message

- s/cant/can't/

MFC after:  1 week
---
 sys/amd64/vmm/amd/ivrs_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c
index 7dd68d8aea95..34aebc62fed4 100644
--- a/sys/amd64/vmm/amd/ivrs_drv.c
+++ b/sys/amd64/vmm/amd/ivrs_drv.c
@@ -416,7 +416,7 @@ ivhd_identify(driver_t *driver, device_t parent)
if (ivhd_devs[i] == NULL) {
ivhd_devs[i] = device_find_child(parent, "ivhd", i);
if (ivhd_devs[i] == NULL) {
-   printf("AMD-Vi: cant find ivhd%d\n", i);
+   printf("AMD-Vi: can't find ivhd%d\n", i);
break;
}
}

git: 026520a5f2d2 - main - wtap: Fix typos in kernel messages

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=026520a5f2d2ec01e19494c37b87448df86ef21a

commit 026520a5f2d2ec01e19494c37b87448df86ef21a
Author: Gordon Bergling 
AuthorDate: 2024-04-21 07:47:24 +
Commit: Gordon Bergling 
CommitDate: 2024-04-21 07:47:24 +

wtap: Fix typos in kernel messages

- s/cant/can't/

MFC after:  1 week
---
 sys/dev/wtap/if_wtap.c  | 2 +-
 sys/dev/wtap/wtap_hal/hal.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/dev/wtap/if_wtap.c b/sys/dev/wtap/if_wtap.c
index 040fc340cb13..f9e0c2a7e5c4 100644
--- a/sys/dev/wtap/if_wtap.c
+++ b/sys/dev/wtap/if_wtap.c
@@ -595,7 +595,7 @@ wtap_transmit(struct ieee80211com *ic, struct mbuf *m)
struct wtap_vap *avp = WTAP_VAP(vap);
 
if(ni == NULL){
-   printf("m->m_pkthdr.rcvif is NULL we cant radiotap_tx\n");
+   printf("m->m_pkthdr.rcvif is NULL we can't radiotap_tx\n");
}else{
if (ieee80211_radiotap_active_vap(vap))
ieee80211_radiotap_tx(vap, m);
diff --git a/sys/dev/wtap/wtap_hal/hal.c b/sys/dev/wtap/wtap_hal/hal.c
index 422def943d34..1e23b99bc272 100644
--- a/sys/dev/wtap/wtap_hal/hal.c
+++ b/sys/dev/wtap/wtap_hal/hal.c
@@ -190,7 +190,7 @@ new_wtap(struct wtap_hal *hal, int32_t id)
MTX_DEF | MTX_RECURSE);
 
if(wtap_attach(hal->hal_devs[id], macaddr)){
-   printf("%s, cant alloc new wtap\n", __func__);
+   printf("%s, can't alloc new wtap\n", __func__);
return -1;
}
 
@@ -208,7 +208,7 @@ free_wtap(struct wtap_hal *hal, int32_t id)
}
 
if(wtap_detach(hal->hal_devs[id]))
-   printf("%s, cant alloc new wtap\n", __func__);
+   printf("%s, can't alloc new wtap\n", __func__);
mtx_destroy(&hal->hal_devs[id]->sc_mtx);
free(hal->hal_devs[id], M_WTAP);
hal->hal_devs[id] = NULL;

git: c0a01ee83d3d - main - geom(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=c0a01ee83d3d4749ac9e7e46d8d47b991c65537f

commit c0a01ee83d3d4749ac9e7e46d8d47b991c65537f
Author: Gordon Bergling 
AuthorDate: 2024-04-21 07:49:44 +
Commit: Gordon Bergling 
CommitDate: 2024-04-21 07:49:44 +

geom(4): Fix a typo in a source code comment

- s/cant/can't/

MFC after:  3 days
---
 sys/geom/geom_subr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c
index 6aa7ded19537..3fef8a918530 100644
--- a/sys/geom/geom_subr.c
+++ b/sys/geom/geom_subr.c
@@ -475,7 +475,7 @@ g_wither_geom_close(struct g_geom *gp, int error)
 }
 
 /*
- * This function is called (repeatedly) until we cant wash away more
+ * This function is called (repeatedly) until we can't wash away more
  * withered bits at present.
  */
 void

git: 9576fc16ca6c - main - uipc_domain: Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=9576fc16ca6cb360e085735dfaf891ae6d7f6181

commit 9576fc16ca6cb360e085735dfaf891ae6d7f6181
Author: Gordon Bergling 
AuthorDate: 2024-04-21 07:51:14 +
Commit: Gordon Bergling 
CommitDate: 2024-04-21 07:51:14 +

uipc_domain: Fix a typo in a source code comment

- s/cant/can't/

MFC after:  3 days
---
 sys/kern/uipc_domain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index ab00bf2bc71f..43bdd44a09bf 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -223,7 +223,7 @@ pr_init(struct domain *dom, struct protosw *pr)
 
 /*
  * Add a new protocol domain to the list of supported domains
- * Note: you cant unload it again because a socket may be using it.
+ * Note: you can't unload it again because a socket may be using it.
  * XXX can't fail at this time.
  */
 void

git: 26f6c148bce2 - main - freescale: Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=26f6c148bce2d6734a07ea621616724f1e76e4fd

commit 26f6c148bce2d6734a07ea621616724f1e76e4fd
Author: Gordon Bergling 
AuthorDate: 2024-04-21 07:52:14 +
Commit: Gordon Bergling 
CommitDate: 2024-04-21 07:52:14 +

freescale: Fix a typo in a source code comment

- s/cant/can't/

MFC after:  3 days
---
 sys/arm/freescale/vybrid/vf_sai.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/arm/freescale/vybrid/vf_sai.c 
b/sys/arm/freescale/vybrid/vf_sai.c
index 7cb533f0ddbb..6a36ddc3c057 100644
--- a/sys/arm/freescale/vybrid/vf_sai.c
+++ b/sys/arm/freescale/vybrid/vf_sai.c
@@ -461,7 +461,7 @@ find_edma_controller(struct sc_info *sc)
sc->edma_chnum = edma_sc->channel_configure(edma_sc, edma_mux_group,
edma_src_transmit);
if (sc->edma_chnum < 0) {
-   /* cant setup eDMA */
+   /* can't setup eDMA */
return (ENXIO);
}
 

Re: git: 8993d785a261 - main - expand.1: Fix markup for the '-t' option

[Gordon Bergling]

Hi des,

On Sat, Apr 20, 2024 at 09:40:26PM +0200, Dag-Erling Smørgrav wrote:
> Gordon Bergling  writes:
> > expand.1: Fix markup for the '-t' option
> > 
> > When viewing the manpage the '-t' option is shown as follows
> > 
> > -t -Sm tab1, tab2, ..., tabn Sm
> > 
> > with the markup '\&Sm' included within '.It Fl t', which doesn't
> > makes any sense.
> > 
> > So just remove it.
> 
> You can't just remove the Sm, you need to add Ns before and after each
> comma to do what the Sm was intended to do.  This is why we have a patch
> review system, please use it.

I usualy always create differentials for changes, but I try to avoid them
for one-line changes. I have tested various combinations for the .Sm usage,
but I didn't saw any change in the manual page formating when removing the
macro, so that was the easiest thing to have the '-t' option not advertising
a none existing '-Sm' option.

--Gordon


signature.asc
Description: PGP signature

git: 78e4dbc34559 - main - ipfw: Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=78e4dbc34559f7b18ea85cafd6663db4e6d54af9

commit 78e4dbc34559f7b18ea85cafd6663db4e6d54af9
Author: Gordon Bergling 
AuthorDate: 2024-05-12 08:53:40 +
Commit: Gordon Bergling 
CommitDate: 2024-05-12 08:53:40 +

ipfw: Fix a typo in a source code comment

- s/defaul/default/

MFC after:  3 days
---
 sys/netinet/ip_fw.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h
index 2b59e46b5bcc..937dc8fbbbc2 100644
--- a/sys/netinet/ip_fw.h
+++ b/sys/netinet/ip_fw.h
@@ -979,7 +979,7 @@ typedef struct _ipfw_range_tlv {
 #defineIPFW_RCFLAG_USER(IPFW_RCFLAG_RANGE | IPFW_RCFLAG_ALL | \
IPFW_RCFLAG_SET | IPFW_RCFLAG_DYNAMIC)
 /* Internally used flags */
-#defineIPFW_RCFLAG_DEFAULT 0x0100  /* Do not skip defaul rule  
*/
+#defineIPFW_RCFLAG_DEFAULT 0x0100  /* Do not skip default rule 
*/
 
 typedef struct _ipfw_ta_tinfo {
uint32_tflags;  /* Format flags */

git: 421025a274fb - main - access.2: Mention that lstat(2) should be used for symbolic links

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=421025a274fb5759b3ecc8bdb30b24db830b45ae

commit 421025a274fb5759b3ecc8bdb30b24db830b45ae
Author: Gordon Bergling 
AuthorDate: 2024-05-13 08:40:12 +
Commit: Gordon Bergling 
CommitDate: 2024-05-13 08:40:12 +

access.2: Mention that lstat(2) should be used for symbolic links

access(), eaccess() and faccessat() will always dereference
symbolic links.

So add a note in the manual page, that lstat(2) should be
used in the case of symbolic links.

PR: 262895
Reviewed by:gbe, pauamma_gundo.com
MFC after:  1 week
Differential Revision:  https://reviews.freebsd.org/D44890
---
 lib/libsys/access.2 | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/libsys/access.2 b/lib/libsys/access.2
index 1dab63afccde..91fe50a08cc4 100644
--- a/lib/libsys/access.2
+++ b/lib/libsys/access.2
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 30, 2021
+.Dd May 13, 2024
 .Dt ACCESS 2
 .Os
 .Sh NAME
@@ -147,6 +147,15 @@ Likewise for
 .Dv R_OK
 and
 .Dv W_OK .
+.Pp
+.Fn access ,
+.Fn eaccess
+and
+.Fn faccessat
+will always dereference symbolic links.
+If the symbolic link itself needs to be referenced,
+.Xr lstat 2
+should be used instead.
 .Sh RETURN VALUES
 .Rv -std
 .Sh ERRORS

git: 7037ebe63dd1 - main - netgraph: Fix two typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=7037ebe63dd1a2ff2a818359c58ca24b6d44388a

commit 7037ebe63dd1a2ff2a818359c58ca24b6d44388a
Author: Gordon Bergling 
AuthorDate: 2024-01-20 16:22:28 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 16:22:28 +

netgraph: Fix two typos in source code comments

- s/bascially/basically/
- s/simpliest/simplest/

MFC after:  3 days
---
 sys/netgraph/ng_sample.h | 2 +-
 sys/netgraph/ng_tag.c| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/netgraph/ng_sample.h b/sys/netgraph/ng_sample.h
index 994f322cf05a..f7f7cb417626 100644
--- a/sys/netgraph/ng_sample.h
+++ b/sys/netgraph/ng_sample.h
@@ -73,7 +73,7 @@ struct ngxxxstat {
 
 /*
  * This is used to define the 'parse type' for a struct ngxxxstat, which
- * is bascially a description of how to convert a binary struct ngxxxstat
+ * is basically a description of how to convert a binary struct ngxxxstat
  * to an ASCII string and back.  See ng_parse.h for more info.
  *
  * This needs to be kept in sync with the above structure definition
diff --git a/sys/netgraph/ng_tag.c b/sys/netgraph/ng_tag.c
index ea84148e59ef..31417417c0ed 100644
--- a/sys/netgraph/ng_tag.c
+++ b/sys/netgraph/ng_tag.c
@@ -258,7 +258,7 @@ NETGRAPH_INIT(tag, &typestruct);
  * One could ask why to have this structures at all when we have
  * ng_tag_hookinfo initialized to zero and don't need in and out structures
  * at all to operate.  Unfortunatelly, we have to return thisHook field
- * in response to messages so the fastest and simpliest way is to have
+ * in response to messages so the fastest and simplest way is to have
  * this default structures and initialize thisHook once at hook creation
  * rather than to do it on every response.
  */

git: 6f0da017c973 - main - fusefs(5): Fix a typo in a SDT probe

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=6f0da017c973f40c1bc70552c922c500a0a8c858

commit 6f0da017c973f40c1bc70552c922c500a0a8c858
Author: Gordon Bergling 
AuthorDate: 2024-01-20 16:24:22 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 16:24:22 +

fusefs(5): Fix a typo in a SDT probe

- s/userpace/userspace/

MFC after:  5 days
---
 sys/fs/fuse/fuse_internal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/fs/fuse/fuse_internal.c b/sys/fs/fuse/fuse_internal.c
index 55ac7f1b1bed..f4a2e7efc908 100644
--- a/sys/fs/fuse/fuse_internal.c
+++ b/sys/fs/fuse/fuse_internal.c
@@ -996,7 +996,7 @@ fuse_internal_init_callback(struct fuse_ticket *tick, 
struct uio *uio)
 * But there would be little payoff.
 */
SDT_PROBE2(fusefs, , internal, trace, 1,
-   "userpace version too low");
+   "userspace version too low");
err = EPROTONOSUPPORT;
goto out;
}

git: 7cf293536eba - main - devfs(5): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=7cf293536ebacc92150be12e0be928500e670610

commit 7cf293536ebacc92150be12e0be928500e670610
Author: Gordon Bergling 
AuthorDate: 2024-01-20 16:25:45 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 16:25:45 +

devfs(5): Fix a typo in a source code comment

- s/interpeted/interpreted/

MFC after:  3 days
---
 sys/fs/devfs/devfs_rule.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c
index 66fc00dfcb39..37d24577792d 100644
--- a/sys/fs/devfs/devfs_rule.c
+++ b/sys/fs/devfs/devfs_rule.c
@@ -45,7 +45,7 @@
  *
  * A note on "special" identifiers: Ruleset 0 is the NULL, or empty,
  * ruleset; it cannot be deleted or changed in any way.  This may be
- * assumed inside the code; e.g., a ruleset of 0 may be interpeted to
+ * assumed inside the code; e.g., a ruleset of 0 may be interpreted to
  * mean "no ruleset".  The interpretation of rule 0 is
  * command-dependent, but in no case is there a real rule with number
  * 0.

git: b2ec175fcaac - main - _umtx_op.2: Fix a typo in the manual page

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=b2ec175fcaac90fc6a1caf066656eaa092f32611

commit b2ec175fcaac90fc6a1caf066656eaa092f32611
Author: Gordon Bergling 
AuthorDate: 2024-01-20 16:26:34 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 16:26:34 +

_umtx_op.2: Fix a typo in the manual page

- s/interpeted/interpreted/

MFC after:  3 days
---
 lib/libc/sys/_umtx_op.2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libc/sys/_umtx_op.2 b/lib/libc/sys/_umtx_op.2
index 9c0f1f425e47..60f90c32ba35 100644
--- a/lib/libc/sys/_umtx_op.2
+++ b/lib/libc/sys/_umtx_op.2
@@ -424,7 +424,7 @@ regardless of the kind of backing memory.
 Only the address of the start byte of the variable specified as key is
 important for determining corresponding sleep queue.
 The size of the variable does not matter, so, for example, sleep on the same
-address interpeted as
+address interpreted as
 .Vt uint32_t
 and
 .Vt long

git: a2fcd3af5c8a - main - net: Fix two typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=a2fcd3af5c8ad43e8d2c7b89f7bbe3edf2f22e2a

commit a2fcd3af5c8ad43e8d2c7b89f7bbe3edf2f22e2a
Author: Gordon Bergling 
AuthorDate: 2024-01-20 16:28:12 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 16:28:12 +

net: Fix two typos in source code comments

- s/strucutres/structures/

MFC after:  3 days
---
 sys/net/if.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/net/if.h b/sys/net/if.h
index 64b115a17fbb..cbd69b4912ed 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -336,7 +336,7 @@ struct if_msghdr {
  * extensible after ifm_data_off or within ifm_data.  Both the if_msghdr and
  * if_data now have a member field detailing the struct length in addition to
  * the routing message length.  Macros are provided to find the start of
- * ifm_data and the start of the socket address strucutres immediately 
following
+ * ifm_data and the start of the socket address structures immediately 
following
  * struct if_msghdrl given a pointer to struct if_msghdrl.
  */
 #defineIF_MSGHDRL_IFM_DATA(_l) \
@@ -378,7 +378,7 @@ struct ifa_msghdr {
  * extensible after ifam_metric or within ifam_data.  Both the ifa_msghdrl and
  * if_data now have a member field detailing the struct length in addition to
  * the routing message length.  Macros are provided to find the start of
- * ifm_data and the start of the socket address strucutres immediately 
following
+ * ifm_data and the start of the socket address structures immediately 
following
  * struct ifa_msghdrl given a pointer to struct ifa_msghdrl.
  */
 #defineIFA_MSGHDRL_IFAM_DATA(_l) \

git: ef0ac0a1ad67 - main - tcp_hpts: Fix a typo of a function name in a comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=ef0ac0a1ad6750291b881203030384b7f7241efb

commit ef0ac0a1ad6750291b881203030384b7f7241efb
Author: Gordon Bergling 
AuthorDate: 2024-01-20 16:29:28 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 16:29:28 +

tcp_hpts: Fix a typo of a function name in a comment

- s/tcp_ouput/tcp_output/

MFC after:  3 days
---
 sys/netinet/tcp_hpts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c
index 73e9997c060f..9d192b17c41a 100644
--- a/sys/netinet/tcp_hpts.c
+++ b/sys/netinet/tcp_hpts.c
@@ -47,7 +47,7 @@
  *
  * tcp_hpts_insert(tp, HPTS_USEC_TO_SLOTS(550));
  *
- * The above would schedule tcp_ouput() to be called in 550 useconds.
+ * The above would schedule tcp_output() to be called in 550 useconds.
  * Note that if using this mechanism the stack will want to add near
  * its top a check to prevent unwanted calls (from user land or the
  * arrival of incoming ack's). So it would add something like:

git: 938918a9f478 - main - netpfil: Fix two typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=938918a9f478e94fbe65ba84510e4755024560be

commit 938918a9f478e94fbe65ba84510e4755024560be
Author: Gordon Bergling 
AuthorDate: 2024-01-20 16:30:57 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 16:30:57 +

netpfil: Fix two typos in source code comments

- s/withing/within/

MFC after:  3 days
---
 sys/netpfil/ipfw/ip_fw_dynamic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/netpfil/ipfw/ip_fw_dynamic.c b/sys/netpfil/ipfw/ip_fw_dynamic.c
index 5b756cd4c980..283032048845 100644
--- a/sys/netpfil/ipfw/ip_fw_dynamic.c
+++ b/sys/netpfil/ipfw/ip_fw_dynamic.c
@@ -2456,7 +2456,7 @@ dyn_send_keepalive_ipv4(struct ip_fw_chain *chain)
CK_SLIST_FOREACH(s, &V_dyn_ipv4[bucket], entry) {
/*
 * Only established TCP connections that will
-* become expired withing dyn_keepalive_interval.
+* become expired within dyn_keepalive_interval.
 */
if (s->proto != IPPROTO_TCP ||
(s->data->state & BOTH_SYN) != BOTH_SYN ||
@@ -2563,7 +2563,7 @@ dyn_send_keepalive_ipv6(struct ip_fw_chain *chain)
CK_SLIST_FOREACH(s, &V_dyn_ipv6[bucket], entry) {
/*
 * Only established TCP connections that will
-* become expired withing dyn_keepalive_interval.
+* become expired within dyn_keepalive_interval.
 */
if (s->proto != IPPROTO_TCP ||
(s->data->state & BOTH_SYN) != BOTH_SYN ||

git: f5e3329a5a48 - main - usb: Fix two typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=f5e3329a5a480aa1b2904106b2fdfd999439455b

commit f5e3329a5a480aa1b2904106b2fdfd999439455b
Author: Gordon Bergling 
AuthorDate: 2024-01-20 16:32:20 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 16:32:20 +

usb: Fix two typos in source code comments

- s/bascially/basically/
- s/assistence/assistance/

MFC after:  3 days
---
 sys/dev/usb/misc/udbp.h| 2 +-
 sys/dev/usb/serial/uftdi_reg.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/usb/misc/udbp.h b/sys/dev/usb/misc/udbp.h
index eb2c27d5f9ef..a12cc739ef80 100644
--- a/sys/dev/usb/misc/udbp.h
+++ b/sys/dev/usb/misc/udbp.h
@@ -63,7 +63,7 @@ struct ngudbpstat {
 
 /*
  * This is used to define the 'parse type' for a struct ngudbpstat, which
- * is bascially a description of how to convert a binary struct ngudbpstat
+ * is basically a description of how to convert a binary struct ngudbpstat
  * to an ASCII string and back.  See ng_parse.h for more info.
  *
  * This needs to be kept in sync with the above structure definition
diff --git a/sys/dev/usb/serial/uftdi_reg.h b/sys/dev/usb/serial/uftdi_reg.h
index 80936f80b6fa..19794413cf2f 100644
--- a/sys/dev/usb/serial/uftdi_reg.h
+++ b/sys/dev/usb/serial/uftdi_reg.h
@@ -8,7 +8,7 @@
  * USB on the other.
  *
  * Thanx to FTDI (http://www.ftdi.co.uk) for so kindly providing details
- * of the protocol required to talk to the device and ongoing assistence
+ * of the protocol required to talk to the device and ongoing assistance
  * during development.
  *
  * Bill Ryder - bry...@sgi.com of Silicon Graphics, Inc. is the original

git: 623848af6041 - main - vmware: Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=623848af604116aa33bc8a66d2ac45b4cbaccfd8

commit 623848af604116aa33bc8a66d2ac45b4cbaccfd8
Author: Gordon Bergling 
AuthorDate: 2024-01-20 16:33:27 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 16:33:27 +

vmware: Fix a typo in a source code comment

- s/withing/within/

MFC after:  3 days
---
 sys/dev/vmware/vmci/vmci_defs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/vmware/vmci/vmci_defs.h b/sys/dev/vmware/vmci/vmci_defs.h
index cfa302ad11aa..466712c41cee 100644
--- a/sys/dev/vmware/vmci/vmci_defs.h
+++ b/sys/dev/vmware/vmci/vmci_defs.h
@@ -259,7 +259,7 @@ static const struct vmci_handle VMCI_INVALID_HANDLE = 
{VMCI_INVALID_ID,
 #define VMCI_ERROR_QUEUEPAIR_NOT_READY (-40)
 #define VMCI_ERROR_WOULD_BLOCK (-41)
 
-/* VMCI clients should return error code withing this range */
+/* VMCI clients should return error code within this range */
 #define VMCI_ERROR_CLIENT_MIN  (-500)
 #define VMCI_ERROR_CLIENT_MAX  (-550)
 

git: ced92d000a94 - main - ciss(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=ced92d000a9435745ca2891734e6e37ab1c5e873

commit ced92d000a9435745ca2891734e6e37ab1c5e873
Author: Gordon Bergling 
AuthorDate: 2024-01-20 16:34:25 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 16:34:25 +

ciss(4): Fix a typo in a source code comment

- s/strucutre/structure/

MFC after:  3 days
---
 sys/dev/ciss/cissreg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h
index 9e7434b74291..14cc8d7abf96 100644
--- a/sys/dev/ciss/cissreg.h
+++ b/sys/dev/ciss/cissreg.h
@@ -691,7 +691,7 @@ struct ciss_bmic_id_table {
 /*
  * Below here I have no documentation on the rest of this data structure.  It 
is
  * inferred from the opensource cciss_vol_status application.  I assume that 
this 
- * data strucutre is 512 bytes in total size, do not exceed it.
+ * data structure is 512 bytes in total size, do not exceed it.
  */
 u_int8_t   bDdffVersion[4]; /* DDFF update engine version  
*/
 u_int16_t  usMaxLogicalUnits;   /* Maximum logical units supported */

git: 2b1e4e5be304 - main - atse(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=2b1e4e5be3047411df5e4d5442aa7de6489a0309

commit 2b1e4e5be3047411df5e4d5442aa7de6489a0309
Author: Gordon Bergling 
AuthorDate: 2024-01-20 16:35:51 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 16:35:51 +

atse(4): Fix a typo in a source code comment

- s/addresss/address/

MFC after:  3 days
---
 sys/dev/altera/atse/if_atse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/altera/atse/if_atse.c b/sys/dev/altera/atse/if_atse.c
index bd252693e6df..923292484207 100644
--- a/sys/dev/altera/atse/if_atse.c
+++ b/sys/dev/altera/atse/if_atse.c
@@ -580,7 +580,7 @@ atse_get_eth_address(struct atse_softc *sc)
sc->atse_eth_addr[4] = atse_ethernet_option_bits[8];
sc->atse_eth_addr[5] = atse_ethernet_option_bits[9];
 
-   /* Handle factory default ethernet addresss: 00:07:ed:ff:ed:15 */
+   /* Handle factory default ethernet address: 00:07:ed:ff:ed:15 */
if (sc->atse_eth_addr[0] == 0x00 && sc->atse_eth_addr[1] == 0x07 &&
sc->atse_eth_addr[2] == 0xed && sc->atse_eth_addr[3] == 0xff &&
sc->atse_eth_addr[4] == 0xed && sc->atse_eth_addr[5] == 0x15) {

git: a70008e95b90 - main - sigfastblock.2: Fix a typo in the manual page

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=a70008e95b907336bddbcc2aa9d567df6e3a41b6

commit a70008e95b907336bddbcc2aa9d567df6e3a41b6
Author: Gordon Bergling 
AuthorDate: 2024-01-20 18:54:33 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 18:54:33 +

sigfastblock.2: Fix a typo in the manual page

- s/successfull/successful/

MFC after:  3 days
---
 lib/libc/sys/sigfastblock.2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libc/sys/sigfastblock.2 b/lib/libc/sys/sigfastblock.2
index 84ce6cd15090..72897191c4bc 100644
--- a/lib/libc/sys/sigfastblock.2
+++ b/lib/libc/sys/sigfastblock.2
@@ -129,7 +129,7 @@ The variable address passed to
 is not aligned naturally.
 The
 .Dv SIGFASTBLOCK_UNSETPTR
-operation was attempted without prior successfull call to
+operation was attempted without prior successful call to
 .Dv SIGFASTBLOCK_SETPTR .
 .It Bq Er EFAULT
 Attempt to read or write to the sigblock variable failed.

git: 8593b5b2addf - main - pkru.3: Fix a typo in the manual page

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=8593b5b2addf91987f81ebac0d8b2e51207e4793

commit 8593b5b2addf91987f81ebac0d8b2e51207e4793
Author: Gordon Bergling 
AuthorDate: 2024-01-20 18:55:08 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 18:55:08 +

pkru.3: Fix a typo in the manual page

- s/successfull/successful/

MFC after:  3 days
---
 lib/libc/x86/sys/pkru.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libc/x86/sys/pkru.3 b/lib/libc/x86/sys/pkru.3
index 1785f93cf4b6..2bcb6a64baaa 100644
--- a/lib/libc/x86/sys/pkru.3
+++ b/lib/libc/x86/sys/pkru.3
@@ -106,7 +106,7 @@ and having length
 .Fa len .
 Starting address is truncated to the page start,
 and the end is rounded up to the end of the page.
-After a successfull call, the range has the specified key assigned,
+After a successful call, the range has the specified key assigned,
 even if the key is zero and it did not change the page table entries.
 .Pp
 The

git: e1c0d368d630 - main - bce(4): Fix a typo in a kernel message

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e1c0d368d630cce01691e1967ada9f36d6b8c751

commit e1c0d368d630cce01691e1967ada9f36d6b8c751
Author: Gordon Bergling 
AuthorDate: 2024-01-20 19:10:21 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 19:10:21 +

bce(4): Fix a typo in a kernel message

- s/adddress/address/

MFC after:  5 days
---
 sys/dev/bce/if_bce.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c
index 53b503ab2fc8..33158b75486c 100644
--- a/sys/dev/bce/if_bce.c
+++ b/sys/dev/bce/if_bce.c
@@ -10661,7 +10661,7 @@ bce_dump_driver_state(struct bce_softc *sc)
val_hi = BCE_ADDR_HI(sc->tx_bd_chain);
val_lo = BCE_ADDR_LO(sc->tx_bd_chain);
BCE_PRINTF("0x%08X:%08X - (sc->tx_bd_chain) tx_bd chain "
-   "virtual adddress\n", val_hi, val_lo);
+   "virtual address\n", val_hi, val_lo);
 
val_hi = BCE_ADDR_HI(sc->rx_bd_chain);
val_lo = BCE_ADDR_LO(sc->rx_bd_chain);

git: bce295fcbe53 - main - PCI_IOV_INIT.9: Fix a typo in the manual page

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=bce295fcbe533d46d2f600168403c7968599b86b

commit bce295fcbe533d46d2f600168403c7968599b86b
Author: Gordon Bergling 
AuthorDate: 2024-01-20 19:20:32 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 19:20:32 +

PCI_IOV_INIT.9: Fix a typo in the manual page

- s/infrastucture/infrastructure/

MFC after:  3 days
---
 share/man/man9/PCI_IOV_INIT.9 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/man/man9/PCI_IOV_INIT.9 b/share/man/man9/PCI_IOV_INIT.9
index 3e71a65e4132..66b1e693cedb 100644
--- a/share/man/man9/PCI_IOV_INIT.9
+++ b/share/man/man9/PCI_IOV_INIT.9
@@ -40,7 +40,7 @@
 The
 .Fn PCI_IOV_INIT
 method is called by the PCI Single-Root I/O Virtualization (SR-IOV)
-infrastucture when the user requests that SR-IOV be enabled on a Physical
+infrastructure when the user requests that SR-IOV be enabled on a Physical
 Function (PF).
 The number of Virtual Functions (VFs) that will be created is passed to this
 method in the

git: 3fb6adb07915 - main - gjournal(8): Fix a typo in a sysctl description

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=3fb6adb07915b6759892c937fe4ae8a07ed1a029

commit 3fb6adb07915b6759892c937fe4ae8a07ed1a029
Author: Gordon Bergling 
AuthorDate: 2024-01-20 19:58:08 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 19:58:08 +

gjournal(8): Fix a typo in a sysctl description

- s/entires/entries/

MFC after:  5 days
---
 sys/geom/journal/g_journal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c
index 92c197d98aa3..6d9f6239e632 100644
--- a/sys/geom/journal/g_journal.c
+++ b/sys/geom/journal/g_journal.c
@@ -131,7 +131,7 @@ g_journal_record_entries_sysctl(SYSCTL_HANDLER_ARGS)
 SYSCTL_PROC(_kern_geom_journal, OID_AUTO, record_entries,
 CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, NULL, 0,
 g_journal_record_entries_sysctl, "I",
-"Maximum number of entires in one journal record");
+"Maximum number of entries in one journal record");
 SYSCTL_UINT(_kern_geom_journal, OID_AUTO, optimize, CTLFLAG_RW,
 &g_journal_do_optimize, 0, "Try to combine bios on flush and copy");
 

git: b4c94968d1bd - main - if_llatbl: Fix a typo in a KASSERT message

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=b4c94968d1bd1ffdd43976b0315e2b6c2b620ee2

commit b4c94968d1bd1ffdd43976b0315e2b6c2b620ee2
Author: Gordon Bergling 
AuthorDate: 2024-01-20 20:00:22 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 20:00:22 +

if_llatbl: Fix a typo in a KASSERT message

- s/entires/entries/

MFC after:  5 days
---
 sys/net/if_llatbl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c
index fe5273cf19c0..f6bfeff8a9b0 100644
--- a/sys/net/if_llatbl.c
+++ b/sys/net/if_llatbl.c
@@ -706,7 +706,7 @@ lltable_free(struct lltable *llt)
llentry_free(lle);
}
 
-   KASSERT(llt->llt_entries == 0, ("%s: lltable %p (%s) entires not 0: %d",
+   KASSERT(llt->llt_entries == 0, ("%s: lltable %p (%s) entries not 0: %d",
__func__, llt, llt->llt_ifp->if_xname, llt->llt_entries));
 
llt->llt_free_tbl(llt);

git: 54e047b13baa - main - aic7xxx: Fix a typo in a kernel message

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=54e047b13baaa5eb613e98991f807e7b6f893f78

commit 54e047b13baaa5eb613e98991f807e7b6f893f78
Author: Gordon Bergling 
AuthorDate: 2024-01-20 21:01:10 +
Commit: Gordon Bergling 
CommitDate: 2024-01-20 21:01:10 +

aic7xxx: Fix a typo in a kernel message

- s/recevied/received/

MFC after:  5 days
---
 sys/dev/aic7xxx/aic7xxx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c
index ea80c9d0602f..4b62f76b9cf8 100644
--- a/sys/dev/aic7xxx/aic7xxx.c
+++ b/sys/dev/aic7xxx/aic7xxx.c
@@ -1109,7 +1109,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat)
printf("\tCRC Value Mismatch\n");
if ((sstat2 & CRCENDERR) != 0)
printf("\tNo terminal CRC packet "
-  "recevied\n");
+  "received\n");
if ((sstat2 & CRCREQERR) != 0)
printf("\tIllegal CRC packet "
   "request\n");

git: d04df664776b - main - bootpd(8): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=d04df664776b436f712051520d48f84be93ab269

commit d04df664776b436f712051520d48f84be93ab269
Author: Gordon Bergling 
AuthorDate: 2024-01-22 20:46:31 +
Commit: Gordon Bergling 
CommitDate: 2024-01-22 20:46:31 +

bootpd(8): Fix a typo in a source code comment

- s/adddress/address/

MFC after:  3 days
---
 libexec/bootpd/dumptab.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c
index 3961cb4210cb..9b839c26c5b9 100644
--- a/libexec/bootpd/dumptab.c
+++ b/libexec/bootpd/dumptab.c
@@ -323,7 +323,7 @@ dump_generic(FILE *fp, struct shared_bindata *generic)
  *
  * The addresses are printed in standard ASCII "dot" notation and separated
  * from one another by a single space.  A single leading space is also
- * printed before the first adddress.
+ * printed before the first address.
  *
  * Null lists produce no output (and no error).
  */

git: b971c51a4d94 - main - aic7xxx: Fix two typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=b971c51a4d9498c26079fd8229f7af6ef1585020

commit b971c51a4d9498c26079fd8229f7af6ef1585020
Author: Gordon Bergling 
AuthorDate: 2024-01-22 20:47:23 +
Commit: Gordon Bergling 
CommitDate: 2024-01-22 20:47:23 +

aic7xxx: Fix two typos in source code comments

- s/recevied/received/

MFC after:  3 days
---
 sys/dev/aic7xxx/aic79xx.seq | 2 +-
 sys/dev/aic7xxx/aic7xxx.seq | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/aic7xxx/aic79xx.seq b/sys/dev/aic7xxx/aic79xx.seq
index 118c4f187486..85957102eb5e 100644
--- a/sys/dev/aic7xxx/aic79xx.seq
+++ b/sys/dev/aic7xxx/aic79xx.seq
@@ -1198,7 +1198,7 @@ mesgin_complete:
testSEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation;
 
/*
-* If we recevied good status but never successfully sent the
+* If we received good status but never successfully sent the
 * cdb, abort the command.
 */
testSCB_SCSI_STATUS,0xffjnz complete_accepted;
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index 1ae250d880bf..a94e2dae4149 100644
--- a/sys/dev/aic7xxx/aic7xxx.seq
+++ b/sys/dev/aic7xxx/aic7xxx.seq
@@ -1639,7 +1639,7 @@ mesgin_complete:
testSEQ_FLAGS, NOT_IDENTIFIED jnz mesgin_proto_violation;
 
/*
-* If we recevied good status but never successfully sent the
+* If we received good status but never successfully sent the
 * cdb, abort the command.
 */
testSCB_SCSI_STATUS,0xffjnz complete_accepted;

git: 496432f19216 - main - netinet6: Fix two typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=496432f192165b8700da4b0ab8ebdd253002e265

commit 496432f192165b8700da4b0ab8ebdd253002e265
Author: Gordon Bergling 
AuthorDate: 2024-01-22 20:48:34 +
Commit: Gordon Bergling 
CommitDate: 2024-01-22 20:48:34 +

netinet6: Fix two typos in source code comments

- s/adddress/address/

MFC after:  3 days
---
 sys/netinet6/nd6_nbr.c | 2 +-
 sys/netinet6/scope6.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index 7d89fcc4ee69..7b4fa7a8d8c9 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -262,7 +262,7 @@ nd6_ns_input(struct mbuf *m, int off, int icmp6len)
}
if (ifa == NULL) {
/*
-* We've got an NS packet, and we don't have that adddress
+* We've got an NS packet, and we don't have that address
 * assigned for us.  We MUST silently ignore it.
 * See RFC2461 7.2.3.
 */
diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c
index f3cfd4602548..0987ea7e99ad 100644
--- a/sys/netinet6/scope6.c
+++ b/sys/netinet6/scope6.c
@@ -525,7 +525,7 @@ in6_getscopezone(const struct ifnet *ifp, int scope)
 }
 
 /*
- * Extracts scope from adddress @dst, stores cleared address
+ * Extracts scope from address @dst, stores cleared address
  * inside @dst and zone inside @scopeid
  */
 void

git: 9b035689f15f - main - tcp_fastopen: Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=9b035689f15fc4aec96f9c18c6c86bd615faed2f

commit 9b035689f15fc4aec96f9c18c6c86bd615faed2f
Author: Gordon Bergling 
AuthorDate: 2024-01-22 20:49:47 +
Commit: Gordon Bergling 
CommitDate: 2024-01-22 20:49:47 +

tcp_fastopen: Fix a typo in a source code comment

- s/posession/possession/

MFC after:  3 days
---
 sys/netinet/tcp_fastopen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/netinet/tcp_fastopen.c b/sys/netinet/tcp_fastopen.c
index c31225214d1d..609637b83df3 100644
--- a/sys/netinet/tcp_fastopen.c
+++ b/sys/netinet/tcp_fastopen.c
@@ -43,7 +43,7 @@
  *
  * In addition to the facilities defined in RFC7413, this implementation
  * supports a pre-shared key (PSK) mode of operation in which the TFO server
- * requires the client to be in posession of a shared secret in order for
+ * requires the client to be in possession of a shared secret in order for
  * the client to be able to successfully open TFO connections with the
  * server.  This is useful, for example, in environments where TFO servers
  * are exposed to both internal and external clients and only wish to allow

git: cde9ec6a451d - main - netpfil: Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=cde9ec6a451d22ad65fbe602dc57135177c0a865

commit cde9ec6a451d22ad65fbe602dc57135177c0a865
Author: Gordon Bergling 
AuthorDate: 2024-01-22 20:50:57 +
Commit: Gordon Bergling 
CommitDate: 2024-01-22 20:50:57 +

netpfil: Fix a typo in a source code comment

- s/strucutre/structure/

MFC after:  3 days
---
 sys/netpfil/ipfilter/netinet/ip_pool.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/netpfil/ipfilter/netinet/ip_pool.c 
b/sys/netpfil/ipfilter/netinet/ip_pool.c
index 20a3eed5eb4b..2ded49401658 100644
--- a/sys/netpfil/ipfilter/netinet/ip_pool.c
+++ b/sys/netpfil/ipfilter/netinet/ip_pool.c
@@ -1094,7 +1094,7 @@ ipf_pool_flush(ipf_main_softc_t *softc, void *arg, 
iplookupflush_t *fp)
 /*  ipo(I) - pointer to pool structure  */
 /* Locks:   WRITE(ipf_poolrw) or WRITE(ipf_global)  */
 /*  */
-/* Deletes the pool strucutre passed in from the list of pools and deletes  */
+/* Deletes the pool structure passed in from the list of pools and deletes  */
 /* all of the address information stored in it, including any tree data */
 /* structures also allocated.   */
 /*  */

git: c90f1ed10460 - main - netlink(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=c90f1ed104606f5a691ea2defc5711ca9d28fcc7

commit c90f1ed104606f5a691ea2defc5711ca9d28fcc7
Author: Gordon Bergling 
AuthorDate: 2024-01-22 20:52:16 +
Commit: Gordon Bergling 
CommitDate: 2024-01-22 20:52:16 +

netlink(4): Fix a typo in a source code comment

- s/permament/permanent/

MFC after:  3 days
---
 sys/netlink/route/neigh.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/netlink/route/neigh.h b/sys/netlink/route/neigh.h
index eacacc09711a..10bc3b93d16a 100644
--- a/sys/netlink/route/neigh.h
+++ b/sys/netlink/route/neigh.h
@@ -82,7 +82,7 @@ enum {
 #defineNTF_PROXY   0x0008  /* proxy entry */
 #defineNTF_EXT_LEARNED 0x0010  /* not used */
 #defineNTF_OFFLOADED   0x0020  /* not used */
-#defineNTF_STICKY  0x0040  /* permament entry */
+#defineNTF_STICKY  0x0040  /* permanent entry */
 #defineNTF_ROUTER  0x0080  /* dst indicated itself as a 
router */
 /* start of NDA_FLAGS_EXT */
 #defineNTF_EXT_MANAGED 0x0100  /* not used */

git: ab6d773dbf92 - main - rtsock: Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=ab6d773dbf926e4f92e37b67a85c3290cfb90723

commit ab6d773dbf926e4f92e37b67a85c3290cfb90723
Author: Gordon Bergling 
AuthorDate: 2024-01-22 20:53:21 +
Commit: Gordon Bergling 
CommitDate: 2024-01-22 20:53:21 +

rtsock: Fix a typo in a source code comment

- s/adddress/address/

MFC after:  3 days
---
 sys/net/rtsock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index cb149f176b6d..e4183232700e 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -695,7 +695,7 @@ fill_addrinfo(struct rt_msghdr *rtm, int len, struct 
linear_buffer *lb, u_int fi
 
/* 
 * A host route through the loopback interface is 
-* installed for each interface adddress. In pre 8.0
+* installed for each interface address. In pre 8.0
 * releases the interface address of a PPP link type
 * is not reachable locally. This behavior is fixed as 
 * part of the new L2/L3 redesign and rewrite work. The

git: c1ada3978310 - main - net80211: Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=c1ada39783109c496fde853cc2fe32f31a8f7516

commit c1ada39783109c496fde853cc2fe32f31a8f7516
Author: Gordon Bergling 
AuthorDate: 2024-01-22 20:54:36 +
Commit: Gordon Bergling 
CommitDate: 2024-01-22 20:54:36 +

net80211: Fix a typo in a source code comment

- s/recevied/received/

MFC after:  3 days
---
 sys/net80211/ieee80211_hwmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/net80211/ieee80211_hwmp.c b/sys/net80211/ieee80211_hwmp.c
index 429cd69629fc..c47e845bb8a8 100644
--- a/sys/net80211/ieee80211_hwmp.c
+++ b/sys/net80211/ieee80211_hwmp.c
@@ -1395,7 +1395,7 @@ hwmp_recv_prep(struct ieee80211vap *vap, struct 
ieee80211_node *ni,
 
/*
 * Check if we received a PREP w/ AE and store target external address.
-* We may store target external address if recevied PREP w/ AE
+* We may store target external address if received PREP w/ AE
 * and we are not final destination
 */
if (prep->prep_flags & IEEE80211_MESHPREP_FLAGS_AE) {

git: b2c48aa4d192 - main - vmd(4): Fix typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=b2c48aa4d19268610191a0b7d7b76d01d28b0a13

commit b2c48aa4d19268610191a0b7d7b76d01d28b0a13
Author: Gordon Bergling 
AuthorDate: 2024-01-22 20:55:33 +
Commit: Gordon Bergling 
CommitDate: 2024-01-22 20:55:33 +

vmd(4): Fix typos in source code comments

- s/harwdare/hardware/

MFC after:  3 days
---
 sys/dev/vmd/vmd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/dev/vmd/vmd.c b/sys/dev/vmd/vmd.c
index 42b48da05321..1563d707c6b4 100644
--- a/sys/dev/vmd/vmd.c
+++ b/sys/dev/vmd/vmd.c
@@ -436,7 +436,7 @@ vmd_alloc_resource(device_t dev, device_t child, int type, 
int *rid,
 
switch (type) {
case SYS_RES_IRQ:
-   /* VMD harwdare does not support legacy interrupts. */
+   /* VMD hardware does not support legacy interrupts. */
if (*rid == 0)
return (NULL);
return (bus_generic_alloc_resource(dev, child, type, rid,
@@ -464,7 +464,7 @@ vmd_alloc_resource(device_t dev, device_t child, int type, 
int *rid,
pcib_child_name(child));
break;
default:
-   /* VMD harwdare does not support I/O ports. */
+   /* VMD hardware does not support I/O ports. */
return (NULL);
}
rman_set_rid(res, *rid);
@@ -499,7 +499,7 @@ static int
 vmd_route_interrupt(device_t dev, device_t child, int pin)
 {
 
-   /* VMD harwdare does not support legacy interrupts. */
+   /* VMD hardware does not support legacy interrupts. */
return (PCI_INVALID_IRQ);
 }
 

git: d74371101629 - main - usb: Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=d743711016298046ca77c5661bab41739396a180

commit d743711016298046ca77c5661bab41739396a180
Author: Gordon Bergling 
AuthorDate: 2024-01-22 20:57:06 +
Commit: Gordon Bergling 
CommitDate: 2024-01-22 20:57:06 +

usb: Fix a typo in a source code comment

- s/recevied/received/

MFC after:  3 days
---
 sys/dev/usb/serial/umcs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/usb/serial/umcs.h b/sys/dev/usb/serial/umcs.h
index c8c6135710cf..0d34c54a3707 100644
--- a/sys/dev/usb/serial/umcs.h
+++ b/sys/dev/usb/serial/umcs.h
@@ -169,7 +169,7 @@
 #defineMCS7840_DEV_SPx_LOOP_PIPES  0x01/* Loop Bulk-Out FIFO 
to the
 * Bulk-In FIFO, default = 0 */
 #defineMCS7840_DEV_SPx_SKIP_ERR_DATA   0x02/* Drop data bytes from 
UART,
-* which were recevied with
+* which were received with
 * errors, default = 0 */
 #defineMCS7840_DEV_SPx_RESET_OUT_FIFO  0x04/* Reset Bulk-Out FIFO 
*/
 #defineMCS7840_DEV_SPx_RESET_IN_FIFO   0x08/* Reset Bulk-In FIFO */

git: 97a4045aaf36 - main - virtio(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=97a4045aaf36079f54ee05a8cb314b8a90f20af8

commit 97a4045aaf36079f54ee05a8cb314b8a90f20af8
Author: Gordon Bergling 
AuthorDate: 2024-01-22 20:59:06 +
Commit: Gordon Bergling 
CommitDate: 2024-01-22 20:59:06 +

virtio(4): Fix a typo in a source code comment

- s/recevied/received/

MFC after:  3 days
---
 sys/dev/virtio/network/virtio_net.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/virtio/network/virtio_net.h 
b/sys/dev/virtio/network/virtio_net.h
index 4dfa4d3341f0..4b728f7af21a 100644
--- a/sys/dev/virtio/network/virtio_net.h
+++ b/sys/dev/virtio/network/virtio_net.h
@@ -210,7 +210,7 @@ struct virtio_net_ctrl_mac {
  * Control link announce acknowledgement
  *
  * The command VIRTIO_NET_CTRL_ANNOUNCE_ACK is used to indicate that
- * driver has recevied the notification; device would clear the
+ * driver has received the notification; device would clear the
  * VIRTIO_NET_S_ANNOUNCE bit in the status field after it receives
  * this command.
  */

git: ad92f3d9d0b5 - main - meta2deps.py: Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=ad92f3d9d0b56ee723271152cec9174f74e17cb9

commit ad92f3d9d0b56ee723271152cec9174f74e17cb9
Author: Gordon Bergling 
AuthorDate: 2024-01-22 21:00:36 +
Commit: Gordon Bergling 
CommitDate: 2024-01-22 21:00:36 +

meta2deps.py: Fix a typo in a source code comment

- s/follwing/following/

MFC after:  3 days
---
 share/mk/meta2deps.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/mk/meta2deps.py b/share/mk/meta2deps.py
index d7820ec71b5b..334a008a2ab5 100755
--- a/share/mk/meta2deps.py
+++ b/share/mk/meta2deps.py
@@ -197,7 +197,7 @@ class MetaFile:
 
 def __init__(self, name, conf={}):
 """if name is set we will parse it now.
-conf can have the follwing keys:
+conf can have the following keys:
 
 SRCTOPS list of tops of the src tree(s).
 

git: e125371fb6ff - main - dwc: Fix two typos in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e125371fb6ff22d452c5ae90d3787432b8bfa0d1

commit e125371fb6ff22d452c5ae90d3787432b8bfa0d1
Author: Gordon Bergling 
AuthorDate: 2024-01-22 21:03:29 +
Commit: Gordon Bergling 
CommitDate: 2024-01-22 21:03:29 +

dwc: Fix two typos in a source code comment

- s/recevied/received/
- s/descriptr/descriptor/

MFC after:  3 days
---
 sys/dev/dwc/dwc1000_dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/dwc/dwc1000_dma.c b/sys/dev/dwc/dwc1000_dma.c
index c510c252072c..44b9f0d114bf 100644
--- a/sys/dev/dwc/dwc1000_dma.c
+++ b/sys/dev/dwc/dwc1000_dma.c
@@ -363,7 +363,7 @@ dwc_rxfinish_one(struct dwc_softc *sc, struct dwc_hwdesc 
*desc,
(RDESC0_FS | RDESC0_LS)) {
/*
 * Something very wrong happens. The whole packet should be
-* recevied in one descriptr. Report problem.
+* received in one descriptor. Report problem.
 */
device_printf(sc->dev,
"%s: RX descriptor without FIRST and LAST bit set: 0x%08X",

git: 551921a75775 - main - if_eqos: Fix a typo in a kernel error message

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=551921a757758353af51cd0283e9e4bcee9a84d2

commit 551921a757758353af51cd0283e9e4bcee9a84d2
Author: Gordon Bergling 
AuthorDate: 2024-01-28 15:42:12 +
Commit: Gordon Bergling 
CommitDate: 2024-01-28 15:42:12 +

if_eqos: Fix a typo in a kernel error message

- s/errer/error/

MFC after:  5 days
---
 sys/dev/eqos/if_eqos.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/eqos/if_eqos.c b/sys/dev/eqos/if_eqos.c
index 17c820a1b191..566f6ffd0a42 100644
--- a/sys/dev/eqos/if_eqos.c
+++ b/sys/dev/eqos/if_eqos.c
@@ -687,7 +687,7 @@ eqos_rxintr(struct eqos_softc *sc)
break;
 
if (rdes3 & (EQOS_RDES3_OE | EQOS_RDES3_RE))
-   printf("Receive errer rdes3=%08x\n", rdes3);
+   printf("Receive error rdes3=%08x\n", rdes3);
 
bus_dmamap_sync(sc->rx.buf_tag,
sc->rx.buf_map[sc->rx.head].map, BUS_DMASYNC_POSTREAD);

git: 2fb174d18a42 - main - sctp(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=2fb174d18a42d1b2965164186843540ee65881ea

commit 2fb174d18a42d1b2965164186843540ee65881ea
Author: Gordon Bergling 
AuthorDate: 2024-02-18 12:01:04 +
Commit: Gordon Bergling 
CommitDate: 2024-02-18 12:01:04 +

sctp(4): Fix a typo in a source code comment

- s/anthing/anything/

MFC after:  3 days
---
 sys/netinet/sctp_indata.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index c195cce96f39..a30fd95fef30 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -1359,7 +1359,7 @@ out:
 
 /*
  * Dump onto the re-assembly queue, in its proper place. After dumping on the
- * queue, see if anthing can be delivered. If so pull it off (or as much as
+ * queue, see if anything can be delivered. If so pull it off (or as much as
  * we can. If we run out of space then we must dump what we can and set the
  * appropriate flag to say we queued what we could.
  */

git: f24c816daa00 - main - iov.h: Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=f24c816daa00852f4a1d37649d00905a0d67f1b3

commit f24c816daa00852f4a1d37649d00905a0d67f1b3
Author: Gordon Bergling 
AuthorDate: 2024-02-19 11:02:57 +
Commit: Gordon Bergling 
CommitDate: 2024-02-19 11:02:57 +

iov.h: Fix a typo in a source code comment

- s/subystem/subsystem/

MFC after:  3 days
---
 sys/sys/iov.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/sys/iov.h b/sys/sys/iov.h
index cc9074489559..0171fc5a98cf 100644
--- a/sys/sys/iov.h
+++ b/sys/sys/iov.h
@@ -209,7 +209,7 @@ struct pci_iov_schema
  *(PF or individual VF).
  * Note: We will refer to the section of the configuration schema that
  *   specifies the parameters for this subsystem and device
- *   configuration as the device/subystem schema.
+ *   configuration as the device/subsystem schema.
  * 2) The subsystem node must contain only keys that correspond to parameters
  *that are specified in the device/subsystem schema.
  * 3) Every parameter specified as required in the device/subsystem schema is

git: 94fc800f5bf2 - main - net80211: Fix two typos in kernel messages

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=94fc800f5bf20f573bef0d407c2f61ebcdc15bae

commit 94fc800f5bf20f573bef0d407c2f61ebcdc15bae
Author: Gordon Bergling 
AuthorDate: 2024-02-19 11:08:07 +
Commit: Gordon Bergling 
CommitDate: 2024-02-19 11:08:07 +

net80211: Fix two typos in kernel messages

- s/defered/deferred/

MFC after:  5 days
---
 sys/net80211/ieee80211_hostap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c
index 67c45bd38935..82d8f8b2907b 100644
--- a/sys/net80211/ieee80211_hostap.c
+++ b/sys/net80211/ieee80211_hostap.c
@@ -974,7 +974,7 @@ hostap_auth_open(struct ieee80211_node *ni, struct 
ieee80211_frame *wh,
 */
IEEE80211_NOTE_MAC(vap,
IEEE80211_MSG_AUTH | IEEE80211_MSG_ACL, ni->ni_macaddr,
-   "%s", "station authentication defered (radius acl)");
+   "%s", "station authentication deferred (radius acl)");
ieee80211_notify_node_auth(ni);
} else {
IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1);
@@ -1124,7 +1124,7 @@ hostap_auth_shared(struct ieee80211_node *ni, struct 
ieee80211_frame *wh,
IEEE80211_NOTE_MAC(vap,
IEEE80211_MSG_AUTH | IEEE80211_MSG_ACL,
ni->ni_macaddr,
-   "%s", "station authentication defered (radius 
acl)");
+   "%s", "station authentication deferred (radius 
acl)");
ieee80211_notify_node_auth(ni);
return;
}

git: ffea732c5192 - main - ls.1: Mention CLICOLOR environment variable

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=ffea732c5192070a6877409428b0a2cc1728aa16

commit ffea732c5192070a6877409428b0a2cc1728aa16
Author: Gordon Bergling 
AuthorDate: 2024-02-21 10:54:58 +
Commit: Gordon Bergling 
CommitDate: 2024-02-21 10:54:58 +

ls.1: Mention CLICOLOR environment variable

Mention CLICOLOR environment variable in the manual page.

PR: 276556
Submitted by:   bsdcode at disroot dot org
Reviewed by:imp
MFC after:  3 days
Differential Revision:  https://reviews.freebsd.org/D43970
---
 bin/ls/ls.1 | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index d3daf6e12019..9d4c55b9b17d 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd January 12, 2024
+.Dd February 21, 2024
 .Dt LS 1
 .Os
 .Sh NAME
@@ -244,9 +244,11 @@ but only if
 .Dv stdout
 is a tty and either the
 .Fl G
-flag is specified or the
+flag is specified or one of the environment variables
 .Ev COLORTERM
-environment variable is set and not empty.
+or
+.Ev CLICOLOR
+is set and not empty.
 .Pp
 .Cm never
 will disable color regardless of environment variables.

git: 059fd69e7499 - main - umcs(4): Fix two typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=059fd69e749953c12b2cf099b34d3323d9c67d11

commit 059fd69e749953c12b2cf099b34d3323d9c67d11
Author: Gordon Bergling 
AuthorDate: 2024-02-22 13:14:08 +
Commit: Gordon Bergling 
CommitDate: 2024-02-22 13:14:08 +

umcs(4): Fix two typos in source code comments

- s/frequences/frequencies/

MFC after:  3 days
---
 sys/dev/usb/serial/umcs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/usb/serial/umcs.c b/sys/dev/usb/serial/umcs.c
index ec8c89ab1f8b..18135e3bf67d 100644
--- a/sys/dev/usb/serial/umcs.c
+++ b/sys/dev/usb/serial/umcs.c
@@ -1047,7 +1047,7 @@ umcs7840_set_baudrate(struct umcs7840_softc *sc, uint8_t 
portno, uint32_t rate)
}
DPRINTF("Port %d set speed: %d (%02x / %d)\n", portno, rate, clk, 
divisor);
 
-   /* Set clock source for standard BAUD frequences */
+   /* Set clock source for standard BAUD frequencies */
err = umcs7840_get_reg_sync(sc, umcs7840_port_registers[portno].reg_sp, 
&data);
if (err)
return (err);
@@ -1078,7 +1078,7 @@ umcs7840_set_baudrate(struct umcs7840_softc *sc, uint8_t 
portno, uint32_t rate)
return (0);
 }
 
-/* Maximum speeds for standard frequences, when PLL is not used */
+/* Maximum speeds for standard frequencies, when PLL is not used */
 static const uint32_t umcs7840_baudrate_divisors[] = {0, 115200, 230400, 
403200, 460800, 806400, 921600, 1572864, 3145728,};
 static const uint8_t umcs7840_baudrate_divisors_len = 
nitems(umcs7840_baudrate_divisors);
 

git: 5e89e34f846a - main - random(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=5e89e34f846a233fb97302c05af5a47c694405a1

commit 5e89e34f846a233fb97302c05af5a47c694405a1
Author: Gordon Bergling 
AuthorDate: 2024-02-22 15:54:50 +
Commit: Gordon Bergling 
CommitDate: 2024-02-22 15:54:50 +

random(4): Fix a typo in a source code comment

- s/parmeter/parameter/

MFC after:  3 days
---
 sys/dev/random/hash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/random/hash.c b/sys/dev/random/hash.c
index 8e63d0f638f3..90ac65f42241 100644
--- a/sys/dev/random/hash.c
+++ b/sys/dev/random/hash.c
@@ -124,7 +124,7 @@ randomdev_encrypt_init(union randomdev_key *context, const 
void *data)
 
 /*
  * Create a pseudorandom output stream of 'bytecount' bytes using a CTR-mode
- * cipher or similar.  The 128-bit counter is supplied in the in-out parmeter
+ * cipher or similar.  The 128-bit counter is supplied in the in-out parameter
  * 'ctr.'  The output stream goes to 'd_out.'
  *
  * If AES is used, 'bytecount' is guaranteed to be a multiple of

git: 5a476e64b543 - main - uath(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=5a476e64b543dc63fae7fcd243dc066dced31c3b

commit 5a476e64b543dc63fae7fcd243dc066dced31c3b
Author: Gordon Bergling 
AuthorDate: 2024-02-22 15:55:51 +
Commit: Gordon Bergling 
CommitDate: 2024-02-22 15:55:51 +

uath(4): Fix a typo in a source code comment

- s/parmeter/parameter/

MFC after:  3 days
---
 sys/dev/usb/wlan/if_uathreg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/usb/wlan/if_uathreg.h b/sys/dev/usb/wlan/if_uathreg.h
index 47ec13267e17..91e5f04bc902 100644
--- a/sys/dev/usb/wlan/if_uathreg.h
+++ b/sys/dev/usb/wlan/if_uathreg.h
@@ -50,7 +50,7 @@ struct uath_fwblock {
  *parameter 2
  *   ...
  *
- * A variable-length parameter, or a parmeter that is larger than
+ * A variable-length parameter, or a parameter that is larger than
  * 32 bits is passed as  pair, where length is a
  * 32-bit quantity and data is padded to 32 bits.
  */

git: a53204c22790 - main - sk(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=a53204c22790a94a15f0e3c153f7fa12f9d57d27

commit a53204c22790a94a15f0e3c153f7fa12f9d57d27
Author: Gordon Bergling 
AuthorDate: 2024-02-22 16:16:49 +
Commit: Gordon Bergling 
CommitDate: 2024-02-22 16:16:49 +

sk(4): Fix a typo in a source code comment

- /integeated/integrated/
- s/extented/extended/

Obtained from:  NetBSD
MFC after:  3 days
---
 sys/dev/sk/if_skreg.h  | 2 +-
 sys/dev/sk/xmaciireg.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/sk/if_skreg.h b/sys/dev/sk/if_skreg.h
index 29284025463d..63452e30f575 100644
--- a/sys/dev/sk/if_skreg.h
+++ b/sys/dev/sk/if_skreg.h
@@ -405,7 +405,7 @@
  * fiber-based cards or BCOM for 1000baseT cards with a Broadcom
  * PHY.
  */
-#define SK_PHYTYPE_XMAC0   /* integeated XMAC II PHY */
+#define SK_PHYTYPE_XMAC0   /* integrated XMAC II PHY */
 #define SK_PHYTYPE_BCOM1   /* Broadcom BCM5400 */
 #define SK_PHYTYPE_LONE2   /* Level One LXT1000 */
 #define SK_PHYTYPE_NAT 3   /* National DP83891 */
diff --git a/sys/dev/sk/xmaciireg.h b/sys/dev/sk/xmaciireg.h
index ff836dd48903..dcd91e1640ab 100644
--- a/sys/dev/sk/xmaciireg.h
+++ b/sys/dev/sk/xmaciireg.h
@@ -335,7 +335,7 @@
 #define XM_PHY_ANEXP   0x0006  /* autoneg expansion */
 #define XM_PHY_NEXTP   0x0007  /* nextpage */
 #define XM_PHY_LPNEXTP 0x0008  /* link partner's nextpage */
-#define XM_PHY_EXTSTS  0x000F  /* extented status */
+#define XM_PHY_EXTSTS  0x000F  /* extended status */
 #define XM_PHY_RESAB   0x0010  /* resolved ability */
 
 #define XM_BMCR_DUPLEX 0x0100

git: 04440331b570 - main - vge(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=04440331b5700e124c42b570ae1dfd00ea9c26f7

commit 04440331b5700e124c42b570ae1dfd00ea9c26f7
Author: Gordon Bergling 
AuthorDate: 2024-02-22 16:33:35 +
Commit: Gordon Bergling 
CommitDate: 2024-02-22 16:34:13 +

vge(4): Fix a typo in a source code comment

- s/embadded/embedded/

MFC after:  3 days
---
 sys/dev/vge/if_vgereg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/vge/if_vgereg.h b/sys/dev/vge/if_vgereg.h
index e005526c95c1..c5cb53ef2ca7 100644
--- a/sys/dev/vge/if_vgereg.h
+++ b/sys/dev/vge/if_vgereg.h
@@ -444,7 +444,7 @@
 #define VGE_MIICMD_MOUT0x08/* data out pin enable */
 #define VGE_MIICMD_MDP 0x10/* enable direct programming mode */
 #define VGE_MIICMD_WCMD0x20/* embedded mode write */
-#define VGE_MIICMD_RCMD0x40/* embadded mode read */
+#define VGE_MIICMD_RCMD0x40/* embedded mode read */
 #define VGE_MIICMD_MAUTO   0x80/* enable autopolling */
 
 /* MII address register */

git: d646dca3bc1b - main - bge(4): Fix some typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=d646dca3bc1bbd3bfd38bc5ed375d7a346768dcf

commit d646dca3bc1bbd3bfd38bc5ed375d7a346768dcf
Author: Gordon Bergling 
AuthorDate: 2024-02-22 19:38:50 +
Commit: Gordon Bergling 
CommitDate: 2024-02-22 19:40:10 +

bge(4): Fix some typos in source code comments

- s/firwmare/firmware/
- s/recue/reduce/
- s/throughpout/throughput/
- s/hardwares/hardware/

Obtainted from: NetBSD
MFC after:  3 days
---
 sys/dev/bge/if_bge.c | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index ce4d0856f447..15cd3b0df8e9 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -701,7 +701,7 @@ bge_ape_read_fw_ver(struct bge_softc *sc)
 
sc->bge_mfw_flags |= BGE_MFW_ON_APE;
 
-   /* Fetch the APE firwmare type and version. */
+   /* Fetch the APE firmware type and version. */
apedata = APE_READ_4(sc, BGE_APE_FW_VERSION);
features = APE_READ_4(sc, BGE_APE_FW_FEATURES);
if ((features & BGE_APE_FW_FEATURE_NCSI) != 0) {
@@ -2159,7 +2159,7 @@ bge_blockinit(struct bge_softc *sc)
 * The BD ring replenish thresholds control how often the
 * hardware fetches new BD's from the producer rings in host
 * memory.  Setting the value too low on a busy system can
-* starve the hardware and recue the throughpout.
+* starve the hardware and reduce the throughput.
 *
 * Set the BD ring replentish thresholds. The recommended
 * values are 1/8th the number of descriptors allocated to
@@ -2295,7 +2295,7 @@ bge_blockinit(struct bge_softc *sc)
 */
CSR_WRITE_4(sc, BGE_RXLP_CFG, 0x181);
 
-   /* Inialize RX list placement stats mask. */
+   /* Initialize RX list placement stats mask. */
CSR_WRITE_4(sc, BGE_RXLP_STATS_ENABLE_MASK, 0x007F);
CSR_WRITE_4(sc, BGE_RXLP_STATS_CTL, 0x1);
 
@@ -3536,7 +3536,7 @@ bge_attach(device_t dev)
 * known bug which can't handle TSO if Ethernet header + IP/TCP
 * header is greater than 80 bytes. A workaround for the TSO
 * bug exist but it seems it's too expensive than not using
-* TSO at all. Some hardwares also have the TSO bug so limit
+* TSO at all. Some hardware also have the TSO bug so limit
 * the TSO to the controllers that are not affected TSO issues
 * (e.g. 5755 or higher).
 */

git: 61b88a230bac - main - if_hn: Fix two typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=61b88a230bac766f55984d8d33b98845d2b0d1a9

commit 61b88a230bac766f55984d8d33b98845d2b0d1a9
Author: Gordon Bergling 
AuthorDate: 2024-02-24 09:13:44 +
Commit: Gordon Bergling 
CommitDate: 2024-02-24 09:13:44 +

if_hn: Fix two typos in source code comments

- s/managment/management/
- s/transacion/transaction/

Obtained from:  NetBSD
MFC after:  3 days
---
 sys/dev/hyperv/netvsc/if_hn.c| 2 +-
 sys/dev/hyperv/netvsc/if_hnreg.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c
index f6f885873a79..9949e0a16ab1 100644
--- a/sys/dev/hyperv/netvsc/if_hn.c
+++ b/sys/dev/hyperv/netvsc/if_hn.c
@@ -2523,7 +2523,7 @@ hn_detach(device_t dev)
hn_stop(sc, true);
/*
 * NOTE:
-* hn_stop() only suspends data, so managment
+* hn_stop() only suspends data, so management
 * stuffs have to be suspended manually here.
 */
hn_suspend_mgmt(sc);
diff --git a/sys/dev/hyperv/netvsc/if_hnreg.h b/sys/dev/hyperv/netvsc/if_hnreg.h
index 59ed38b71c72..bc6256bb375b 100644
--- a/sys/dev/hyperv/netvsc/if_hnreg.h
+++ b/sys/dev/hyperv/netvsc/if_hnreg.h
@@ -58,7 +58,7 @@
 #define HN_NVS_RNDIS_MTYPE_CTRL1
 
 /*
- * NVS message transacion status codes.
+ * NVS message transaction status codes.
  */
 #define HN_NVS_STATUS_OK   1
 #define HN_NVS_STATUS_FAILED   2

git: 6e9a71706906 - main - tcp_rack.4: Fix a link in the SEE ALSO section

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=6e9a71706906b86e627cfdd27bc37b88a796f46e

commit 6e9a71706906b86e627cfdd27bc37b88a796f46e
Author: Gordon Bergling 
AuthorDate: 2024-02-25 09:16:25 +
Commit: Gordon Bergling 
CommitDate: 2024-02-25 09:16:25 +

tcp_rack.4: Fix a link in the SEE ALSO section

The URL of the paper at arxiv.org has changed so link the
PDF-file directly.

MFC after:  3 days
---
 share/man/man4/tcp_rack.4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/man/man4/tcp_rack.4 b/share/man/man4/tcp_rack.4
index 791b48baf6f6..566834f4283b 100644
--- a/share/man/man4/tcp_rack.4
+++ b/share/man/man4/tcp_rack.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 17, 2023
+.Dd February 25, 2024
 .Dt TCP_RACK 4
 .Os
 .Sh NAME
@@ -134,7 +134,7 @@ What method should we use for rate sampling 0=high, 1=low
 .%A "Ahmed M. Abdelmoniem"
 .%A "Brahim Bensaou"
 .%T "T-RACKs: A Faster Recovery Mechanism for TCP in Data Center Networks"
-.%O "https://arxiv.org/abs/2102.07477";
+.%O "https://arxiv.org/pdf/2102.07477.pdf";
 .%D "February 2021"
 .Re
 .Sh HISTORY

git: 04d5a8ae0401 - main - vge(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=04d5a8ae04013fd34e3bde5e401b6eaff46ac9c2

commit 04d5a8ae04013fd34e3bde5e401b6eaff46ac9c2
Author: Gordon Bergling 
AuthorDate: 2024-02-27 12:42:10 +
Commit: Gordon Bergling 
CommitDate: 2024-02-27 12:42:10 +

vge(4): Fix a typo in a source code comment

- s/opration/operation/

MFC after:  3 days
---
 sys/dev/vge/if_vge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index fcc47598454e..37606f28ba17 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -1218,7 +1218,7 @@ vge_discard_rxbuf(struct vge_softc *sc, int prod)
 
/*
 * Note: the manual fails to document the fact that for
-* proper opration, the driver needs to replentish the RX
+* proper operation, the driver needs to replentish the RX
 * DMA ring 4 descriptors at a time (rather than one at a
 * time, like most chips). We can allocate the new buffers
 * but we should not set the OWN bits until we're ready

git: 8f87d402e321 - main - dumprestore.h: Fix typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=8f87d402e32178974038212fbf4b1564447df0e0

commit 8f87d402e32178974038212fbf4b1564447df0e0
Author: Gordon Bergling 
AuthorDate: 2024-02-27 12:49:21 +
Commit: Gordon Bergling 
CommitDate: 2024-02-27 12:49:21 +

dumprestore.h: Fix typos in source code comments

- s/dumpped/dumped/

MFC after:  3 days
---
 include/protocols/dumprestore.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/protocols/dumprestore.h b/include/protocols/dumprestore.h
index 4a1f0ec1ed52..3964e26d2a7b 100644
--- a/include/protocols/dumprestore.h
+++ b/include/protocols/dumprestore.h
@@ -114,9 +114,9 @@ extern union u_spcl {
charc_addr[TP_NINDIR];  /* 1 => data; 0 => hole in inode */
charc_label[LBLSIZE];   /* dump label */
int32_t c_level;/* level of this dump */
-   charc_filesys[NAMELEN]; /* name of dumpped file system */
-   charc_dev[NAMELEN]; /* name of dumpped device */
-   charc_host[NAMELEN];/* name of dumpped host */
+   charc_filesys[NAMELEN]; /* name of dumped file system */
+   charc_dev[NAMELEN]; /* name of dumped device */
+   charc_host[NAMELEN];/* name of dumped host */
int32_t c_flags;/* additional information */
int32_t c_old_firstrec; /* first record on volume */
int64_t c_date; /* date of this dump */

git: e2f364961369 - main - bxe(4): Fix two typos in a kernel messages

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e2f36496136975d4b591b230a71986f1508629c1

commit e2f36496136975d4b591b230a71986f1508629c1
Author: Gordon Bergling 
AuthorDate: 2024-02-27 16:38:53 +
Commit: Gordon Bergling 
CommitDate: 2024-02-27 16:38:53 +

bxe(4): Fix two typos in a kernel messages

- s/successfull/successful/

MFC after:  3 days
---
 sys/dev/bxe/bxe.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c
index 36b03ee5c135..8350d02cb2a3 100644
--- a/sys/dev/bxe/bxe.c
+++ b/sys/dev/bxe/bxe.c
@@ -12516,7 +12516,7 @@ bxe_parity_recover(struct bxe_softc *sc)
  error_unrecovered++;
  sc->recovery_state = BXE_RECOVERY_FAILED;
  sc->state = BXE_STATE_ERROR;
- BLOGE(sc, "Recovery is NOT successfull, "
+ BLOGE(sc, "Recovery is NOT successful, "
 " state=0x%x recovery_state=0x%x error=%x\n",
 sc->state, sc->recovery_state, sc->error_status);
  sc->error_status = 0;
@@ -12524,7 +12524,7 @@ bxe_parity_recover(struct bxe_softc *sc)
  sc->recovery_state =
  BXE_RECOVERY_DONE;
  error_recovered++;
- BLOGI(sc, "Recovery is successfull from errors %x,"
+ BLOGI(sc, "Recovery is successful from errors %x,"
 " state=0x%x"
 " recovery_state=0x%x \n", sc->error_status,
 sc->state, sc->recovery_state);

git: 6bce41a38e32 - main - carp(4): Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=6bce41a38e32decbce80bb1586cdd9400c83eb97

commit 6bce41a38e32decbce80bb1586cdd9400c83eb97
Author: Gordon Bergling 
AuthorDate: 2024-02-27 16:39:57 +
Commit: Gordon Bergling 
CommitDate: 2024-02-27 16:39:57 +

carp(4): Fix a typo in a source code comment

- s/successfull/successful/

MFC after:  3 days
---
 sys/netinet/ip_carp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 66ec28e49af3..ddbc13e7c878 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -885,7 +885,7 @@ carp_send_ad_error(struct carp_softc *sc, int error)
 {
 
/*
-* We track errors and successfull sends with this logic:
+* We track errors and successful sends with this logic:
 * - Any error resets success counter to 0.
 * - MAX_ERRORS triggers demotion.
 * - MIN_SUCCESS successes resets error counter to 0.

git: 77f6c0ce9288 - main - nvmecontrol.8: Fix the SYNOPSIS section

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=77f6c0ce92888d047d91e87b931242403764902b

commit 77f6c0ce92888d047d91e87b931242403764902b
Author: Stefan Schlosser 
AuthorDate: 2024-02-28 08:26:20 +
Commit: Gordon Bergling 
CommitDate: 2024-02-28 08:26:20 +

nvmecontrol.8: Fix the SYNOPSIS section

The manpage of nvmecontrol(8) has the following SYNOPSIS:

nvmecontrol format [-f fmt] [-m mset] [-o pi] [-l pil] [-E]
[-C] 

The correct switch for the pi option is -p according
to sbin/nvmecontrol/format.c:

OPT("pi", 'p', arg_uint32, opt, pi, "Protective information")

So correct the SYNOPSIS section accordingly.

PR: 276554
Reviewed by:imp
MFC after:  3 days
Differential Revision:  https://reviews.freebsd.org/D44099
---
 sbin/nvmecontrol/nvmecontrol.8 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sbin/nvmecontrol/nvmecontrol.8 b/sbin/nvmecontrol/nvmecontrol.8
index c4ab4429f5cd..edeeb9afa10f 100644
--- a/sbin/nvmecontrol/nvmecontrol.8
+++ b/sbin/nvmecontrol/nvmecontrol.8
@@ -33,7 +33,7 @@
 .\"
 .\" Author: Jim Harris 
 .\"
-.Dd December 14, 2022
+.Dd February 28, 2022
 .Dt NVMECONTROL 8
 .Os
 .Sh NAME
@@ -155,7 +155,7 @@
 .Ic format
 .Op Fl f Ar fmt
 .Op Fl m Ar mset
-.Op Fl o Ar pi
+.Op Fl p Ar pi
 .Op Fl l Ar pil
 .Op Fl E
 .Op Fl C

git: 865baeaf1abe - main - md5.1: Fix an example

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=865baeaf1abeb14327ad6a4a1f8ce722e242ff73

commit 865baeaf1abeb14327ad6a4a1f8ce722e242ff73
Author: Stefan Schlosser 
AuthorDate: 2024-02-28 08:31:28 +
Commit: Gordon Bergling 
CommitDate: 2024-02-28 08:31:28 +

md5.1: Fix an example

The last example in the manpage md5(1) wants to demonstrate
GNU mode (md5sum), but uses BSD mode (md5) instead:

In GNU mode, the -c option does not compare against a hash string
passed as parameter. Instead, it expects a  digest file,
as created under the name digest for /boot/loader.conf in
the example above.

PR: 276560
Reviewed by:mhorne
MFC after:  3 days
Differential Revision:  https://reviews.freebsd.org/D44098
---
 sbin/md5/md5.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index 0a8dc46f3b1f..88b795da74b1 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -1,4 +1,4 @@
-.Dd February 13, 2024
+.Dd February 28, 2024
 .Dt MD5 1
 .Os
 .Sh NAME
@@ -367,7 +367,7 @@ for
 .Pa /boot/loader.conf
 in the example above.
 .Bd -literal -offset indent
-$ md5 -c digest /boot/loader.conf
+$ md5sum -c digest /boot/loader.conf
 /boot/loader.conf: OK
 .Ed
 .Pp

git: 7701b9935543 - main - tcp_rack.4: Remove a mentioned paper

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=7701b993554321f305ef662a26238f375c4d2dba

commit 7701b993554321f305ef662a26238f375c4d2dba
Author: Gordon Bergling 
AuthorDate: 2024-03-05 02:03:50 +
Commit: Gordon Bergling 
CommitDate: 2024-03-05 02:03:50 +

tcp_rack.4: Remove a mentioned paper

The paper "T-RACKs: A Faster Recovery Mechanism for
TCP in Data Center Networks" has nothing to do with
our TCP RACK implementation, so remove it.

Reported by:tuexen
MFC after:  3 days
---
 share/man/man4/tcp_rack.4 | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/share/man/man4/tcp_rack.4 b/share/man/man4/tcp_rack.4
index 566834f4283b..2ebffca08e26 100644
--- a/share/man/man4/tcp_rack.4
+++ b/share/man/man4/tcp_rack.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd February 25, 2024
+.Dd March 5, 2024
 .Dt TCP_RACK 4
 .Os
 .Sh NAME
@@ -130,13 +130,6 @@ What method should we use for rate sampling 0=high, 1=low
 .%O "RFC 8985"
 .%D "February 2021"
 .Re
-.Rs
-.%A "Ahmed M. Abdelmoniem"
-.%A "Brahim Bensaou"
-.%T "T-RACKs: A Faster Recovery Mechanism for TCP in Data Center Networks"
-.%O "https://arxiv.org/pdf/2102.07477.pdf";
-.%D "February 2021"
-.Re
 .Sh HISTORY
 The
 .Nm

git: a44658281abe - main - Revert "md5.1: Fix an example"

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=a44658281abe1e609a1e13a241fe5ea74a110e7d

commit a44658281abe1e609a1e13a241fe5ea74a110e7d
Author: Gordon Bergling 
AuthorDate: 2024-03-06 08:34:30 +
Commit: Gordon Bergling 
CommitDate: 2024-03-06 08:34:30 +

Revert "md5.1: Fix an example"

This reverts commit 865baeaf1abeb14327ad6a4a1f8ce722e242ff73.
---
 sbin/md5/md5.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index 88b795da74b1..0a8dc46f3b1f 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -1,4 +1,4 @@
-.Dd February 28, 2024
+.Dd February 13, 2024
 .Dt MD5 1
 .Os
 .Sh NAME
@@ -367,7 +367,7 @@ for
 .Pa /boot/loader.conf
 in the example above.
 .Bd -literal -offset indent
-$ md5sum -c digest /boot/loader.conf
+$ md5 -c digest /boot/loader.conf
 /boot/loader.conf: OK
 .Ed
 .Pp

Re: git: f6d489f402c3 - main - Update to bring the rack stack with all its fixes in.

[Gordon Bergling]

Hi Randall,

thanks for updating the RACK stack.

On Mon, Mar 11, 2024 at 11:38:55AM +, Randall Stewart wrote:
> The branch main has been updated by rrs:
> 
> URL: 
> https://cgit.FreeBSD.org/src/commit/?id=f6d489f402c320f1a6eaa473491a0b8c3878113e
> 
> commit f6d489f402c320f1a6eaa473491a0b8c3878113e
> Author: Randall Stewart 
> AuthorDate: 2024-03-11 11:36:54 +
> Commit: Randall Stewart 
> CommitDate: 2024-03-11 11:36:54 +
> 
> Update to bring the rack stack with all its fixes in.
> 
> This brings the rack stack up to the current level used at NF. Many fixes
> and improvements have been added. I also add in a fix to BBR to deal with
> the changes that have been in hpts for a while i.e. only one call no 
> matter
> if mbuf queue or tcp_output.
> 
> Note there is a new file that I can't figure out how to get in rack_pcm.c
> 
> It basically does little except BBlogs and is a placemark for future work 
> on
> doing path capacity measurements.

Regarding rack_pcm.c, this file was actually committed, but has 0-bytes in size.

You could just copy the current file over it, or copy-and-past the code to the
already existing file. Just tried it on my development tree.

--Gordon


signature.asc
Description: PGP signature

git: f3343fe4a64f - main - md5.1: Fix the GNU mode example when using a digest file

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=f3343fe4a64fe6a25b4e09ab9061a45f82e5abc1

commit f3343fe4a64fe6a25b4e09ab9061a45f82e5abc1
Author: Gordon Bergling 
AuthorDate: 2024-03-12 14:44:48 +
Commit: Gordon Bergling 
CommitDate: 2024-03-12 14:44:48 +

md5.1: Fix the GNU mode example when using a digest file

The last example in the manpage md5(1) wants to demonstrate
GNU mode (md5sum), but uses BSD mode (md5) instead.

In GNU mode, the -c option does not compare against a hash string
passed as parameter. Instead, it expects a digest file,
as created under the name digest for /boot/loader.conf in
the example above.

PR: 276560
Reviewed by:mhorne, des
MFC after:  3 days
Differential Revision:  https://reviews.freebsd.org/D44098
---
 sbin/md5/md5.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index 0a8dc46f3b1f..b530292c8269 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -1,4 +1,4 @@
-.Dd February 13, 2024
+.Dd March 12, 2024
 .Dt MD5 1
 .Os
 .Sh NAME
@@ -367,7 +367,7 @@ for
 .Pa /boot/loader.conf
 in the example above.
 .Bd -literal -offset indent
-$ md5 -c digest /boot/loader.conf
+$ md5sum -c digest
 /boot/loader.conf: OK
 .Ed
 .Pp

git: 6a6ec90681cf - main - OpenBSM: Remove $FreeSBD$ tags from the configuration files

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=6a6ec90681cf30eac2512ab96362a35e259fab62

commit 6a6ec90681cf30eac2512ab96362a35e259fab62
Author: Gordon Bergling 
AuthorDate: 2024-03-14 06:02:44 +
Commit: Gordon Bergling 
CommitDate: 2024-03-14 06:02:44 +

OpenBSM: Remove $FreeSBD$ tags from the configuration files

In e61dc6cac4001f1abfc48ee27e4e623c2c044fa8 the configuration
files were taken off the vendor branch to help mergemaster
comparing them.

Since mergemaster will be deprecated and $FreeBSD$ tags aren't
used anymore, remove them.

While here, sync audit_filter with upstream commit 5e6da76 (typo).

Reviewed by:imp
Approved by:imp
MFC after:  1 week
Differential Revision:  https://reviews.freebsd.org/D44318
---
 contrib/openbsm/etc/audit_class   | 3 ---
 contrib/openbsm/etc/audit_control | 3 ---
 contrib/openbsm/etc/audit_event   | 5 +
 contrib/openbsm/etc/audit_filter  | 3 ---
 contrib/openbsm/etc/audit_user| 3 ---
 contrib/openbsm/etc/audit_warn| 3 ---
 6 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/contrib/openbsm/etc/audit_class b/contrib/openbsm/etc/audit_class
index 47868b17d5da..4fdb14efeea0 100644
--- a/contrib/openbsm/etc/audit_class
+++ b/contrib/openbsm/etc/audit_class
@@ -1,6 +1,3 @@
-#
-# $FreeBSD$
-#
 0x:no:invalid class
 0x0001:fr:file read
 0x0002:fw:file write
diff --git a/contrib/openbsm/etc/audit_control 
b/contrib/openbsm/etc/audit_control
index d71b9a817452..aec726820f1e 100644
--- a/contrib/openbsm/etc/audit_control
+++ b/contrib/openbsm/etc/audit_control
@@ -1,6 +1,3 @@
-#
-# $FreeBSD$
-#
 dir:/var/audit
 dist:off
 flags:lo,aa
diff --git a/contrib/openbsm/etc/audit_event b/contrib/openbsm/etc/audit_event
index be3557597eee..31b4adc221a6 100644
--- a/contrib/openbsm/etc/audit_event
+++ b/contrib/openbsm/etc/audit_event
@@ -1,6 +1,3 @@
-#
-# $FreeBSD$
-#
 # The mapping between event identifiers and values is also hard-coded in
 # audit_kevents.h and audit_uevents.h, so changes must occur in both places,
 # and programs, such as the kernel, may need to be recompiled to recognize
@@ -442,7 +439,7 @@
 43079:AUE_CAPGET:capget(2):pc
 43080:AUE_CAPSET:capset(2):pc
 43081:AUE_PIVOT_ROOT:pivot_root(2):pc
-43082:AUE_RTPRIO::rtprio(2):pc
+43082:AUE_RTPRIO:rtprio(2):pc
 43083:AUE_SCHED_GETPARAM:sched_getparam(2):ad
 43084:AUE_SCHED_SETPARAM:sched_setparam(2):ad
 43085:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad
diff --git a/contrib/openbsm/etc/audit_filter b/contrib/openbsm/etc/audit_filter
index d0dc1c0baa5c..8e3fa719d232 100644
--- a/contrib/openbsm/etc/audit_filter
+++ b/contrib/openbsm/etc/audit_filter
@@ -1,5 +1,2 @@
-#
-# $FreeBSD$
-#
 # modulename:various arguments here
 #
diff --git a/contrib/openbsm/etc/audit_user b/contrib/openbsm/etc/audit_user
index 035066228e91..303b0c137efd 100644
--- a/contrib/openbsm/etc/audit_user
+++ b/contrib/openbsm/etc/audit_user
@@ -1,4 +1 @@
-#
-# $FreeBSD$
-#
 root:lo:no
diff --git a/contrib/openbsm/etc/audit_warn b/contrib/openbsm/etc/audit_warn
index 4b8498ea4144..8feb0fa4954f 100644
--- a/contrib/openbsm/etc/audit_warn
+++ b/contrib/openbsm/etc/audit_warn
@@ -1,6 +1,3 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
 
 logger -p security.warning "audit warning: $@"

git: e29be0786117 - main - tcp_rack.4: Update the SEE ALSO section

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e29be07861173f87b2dd46db1d0c7cbcf72d4ad0

commit e29be07861173f87b2dd46db1d0c7cbcf72d4ad0
Author: Gordon Bergling 
AuthorDate: 2024-03-18 18:25:11 +
Commit: Gordon Bergling 
CommitDate: 2024-03-18 18:25:11 +

tcp_rack.4: Update the SEE ALSO section

Correct the surname of one of authors of RFC 8985 and add RFC 5681 and
RFC 6937 (PRR: Proportional Rate Reduction for TCP).

Reviewed by:tuexen
MFC after:  1 week
Differential Revision:  https://reviews.freebsd.org/D44399
---
 share/man/man4/tcp_rack.4 | 20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/share/man/man4/tcp_rack.4 b/share/man/man4/tcp_rack.4
index 2ebffca08e26..73995d930a9a 100644
--- a/share/man/man4/tcp_rack.4
+++ b/share/man/man4/tcp_rack.4
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 5, 2024
+.Dd March 18, 2024
 .Dt TCP_RACK 4
 .Os
 .Sh NAME
@@ -124,12 +124,28 @@ What method should we use for rate sampling 0=high, 1=low
 .Rs
 .%A "Neal Cardwell"
 .%A "Yuchung Cheng"
-.%A "Nandita Dukkipat"
+.%A "Nandita Dukkipati"
 .%A "Priyaranjan Jha"
 .%T "The RACK-TLP Loss Detection Algorithm for TCP"
 .%O "RFC 8985"
 .%D "February 2021"
 .Re
+.Rs
+.%A "M. Allman"
+.%A "V. Paxson"
+.%A "E. Blanton"
+.%T "TCP Congestion Control"
+.%O "RFC 5681"
+.%D "September 2009"
+.Re
+.Rs
+.%A "M. Mathis"
+.%A "Nandita Dukkipati"
+.%A "Yuchung Cheng"
+.%T "Proportional Rate Reduction for TCP"
+.%O "RFC 6937"
+.%D "May 2013"
+.Re
 .Sh HISTORY
 The
 .Nm

git: 577a721d05aa - main - xdr(3): Fix a few typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=577a721d05aa20f38a615ad1cd5089a51c8571c1

commit 577a721d05aa20f38a615ad1cd5089a51c8571c1
Author: Gordon Bergling 
AuthorDate: 2024-03-23 07:43:41 +
Commit: Gordon Bergling 
CommitDate: 2024-03-23 07:43:41 +

xdr(3): Fix a few typos in source code comments

- s/reoutines/routines/
- s/paraemters/parameters/

Obtained from:  NetBSD
MFC after:  3 days
---
 lib/libc/xdr/xdr_rec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c
index 66e11318ea41..f1167fdeaa65 100644
--- a/lib/libc/xdr/xdr_rec.c
+++ b/lib/libc/xdr/xdr_rec.c
@@ -222,7 +222,7 @@ xdrrec_create(XDR *xdrs, u_int sendsize, u_int recvsize, 
void *tcp_handle,
 
 
 /*
- * The reoutines defined below are the xdr ops which will go into the
+ * The routines defined below are the xdr ops which will go into the
  * xdr handle filled in by xdrrec_create.
  */
 
@@ -484,7 +484,7 @@ xdrrec_eof(XDR *xdrs)
 
 /*
  * The client must tell the package when an end-of-record has occurred.
- * The second paraemters tells whether the record should be flushed to the
+ * The second parameters tells whether the record should be flushed to the
  * (output) tcp stream.  (This let's the package support batched or
  * pipelined procedure calls.)  TRUE => immediate flush to tcp connection.
  */

git: 2c3466172ac6 - main - intr_event.9: Remove double word

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=2c3466172ac655dbc030aac7c6d7bf58d76efc0e

commit 2c3466172ac655dbc030aac7c6d7bf58d76efc0e
Author: Gordon Bergling 
AuthorDate: 2024-03-23 16:57:37 +
Commit: Gordon Bergling 
CommitDate: 2024-03-23 16:57:37 +

intr_event.9: Remove double word

- s/of of/of/

MFC after:  3 days
---
 share/man/man9/intr_event.9 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/man/man9/intr_event.9 b/share/man/man9/intr_event.9
index 2ad92c96bdc7..d1964ce289a5 100644
--- a/share/man/man9/intr_event.9
+++ b/share/man/man9/intr_event.9
@@ -230,7 +230,7 @@ argument specifies the priority of this handler,
 corresponding to the values defined in
 .In sys/priority.h .
 It determines the order this handler is called relative to the other handlers
-for this event, as well as the scheduling priority of of the backing kernel
+for this event, as well as the scheduling priority of the backing kernel
 thread.
 .Fa flags
 argument can be used to specify properties of this handler as defined in

git: 619e6f1f9288 - main - cxgbe.4: Remove double word

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=619e6f1f9288ffb6844a6bdf371c9549873cdab7

commit 619e6f1f9288ffb6844a6bdf371c9549873cdab7
Author: Gordon Bergling 
AuthorDate: 2024-03-23 17:00:57 +
Commit: Gordon Bergling 
CommitDate: 2024-03-23 17:01:47 +

cxgbe.4: Remove double word

- s/of of/of/

MFC after:  3 days
---
 share/man/man4/cxgbe.4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/man/man4/cxgbe.4 b/share/man/man4/cxgbe.4
index 3b5a2d8b4d3c..bfba202d1fec 100644
--- a/share/man/man4/cxgbe.4
+++ b/share/man/man4/cxgbe.4
@@ -261,7 +261,7 @@ The default is 1.
 Number of padding bytes inserted before the beginning of an Ethernet
 frame in the receive buffer.
 The default value is 0.
-A value of of 2 would ensure that the Ethernet payload (usually the IP header)
+A value of 2 would ensure that the Ethernet payload (usually the IP header)
 is at a 4 byte aligned address.
 0-7 are all valid values.
 .It Va hw.cxgbe.fl_pad

git: 8a56ef8d75b4 - main - mem.4: Correct the HISTORY section

[Gordon Bergling]

The branch main has been updated by gbe:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=8a56ef8d75b42ee7228247466c8c1712de6e3b6f

commit 8a56ef8d75b42ee7228247466c8c1712de6e3b6f
Author: Gordon Bergling 
AuthorDate: 2024-03-24 05:10:39 +
Commit: Gordon Bergling 
CommitDate: 2024-03-24 05:10:39 +

mem.4: Correct the HISTORY section

The history section (added in CSRG) claimed both first appeared in v6.
Looking at the manuals in the TUHS archive, /dev/mem was in v1
and /dev/kmem was introduced in v5.

Reviewed by:imp
Obtained from:  OpenBSD
MFC after:  5 days
Differential Revision:  https://reviews.freebsd.org/D44486
---
 share/man/man4/mem.4 | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4
index 8359fd1695e9..68969d281532 100644
--- a/share/man/man4/mem.4
+++ b/share/man/man4/mem.4
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 11, 2022
+.Dd March 24, 2024
 .Dt MEM 4
 .Os
 .Sh NAME
@@ -298,11 +298,13 @@ privilege.
 .Xr memcontrol 8
 .Sh HISTORY
 The
-.Nm mem
+.Pa /dev/mem
+file appeared in
+.At v1
 and
-.Nm kmem
-files appeared in
-.At v6 .
+.Pa /dev/kmem
+in
+.At v5 .
 The ioctl interface for memory range attributes was added in
 .Fx 3.2 .
 .Sh BUGS

git: c1ad8a39a1c4 - main - nfsclient: Fix a typos in source code comments

[Gordon Bergling]

The branch main has been updated by gbe (doc committer):

URL: 
https://cgit.FreeBSD.org/src/commit/?id=c1ad8a39a1c4271be62229cf9f6e93e7f1f569e7

commit c1ad8a39a1c4271be62229cf9f6e93e7f1f569e7
Author: Gordon Bergling 
AuthorDate: 2022-03-27 17:27:05 +
Commit: Gordon Bergling 
CommitDate: 2022-03-27 17:27:05 +

nfsclient: Fix a typos in source code comments

- s/ony/only/

Obtained from:  NetBSD
MFC after:  3 days
---
 sys/fs/nfsclient/nfs_clcomsubs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/fs/nfsclient/nfs_clcomsubs.c b/sys/fs/nfsclient/nfs_clcomsubs.c
index 8f593a8d3c92..640d47fed93d 100644
--- a/sys/fs/nfsclient/nfs_clcomsubs.c
+++ b/sys/fs/nfsclient/nfs_clcomsubs.c
@@ -51,7 +51,7 @@ NFSCLSTATEMUTEX;
 
 /*
  * copies a uio scatter/gather list to an mbuf chain.
- * NOTE: can ony handle iovcnt == 1
+ * NOTE: can only handle iovcnt == 1
  */
 void
 nfsm_uiombuf(struct nfsrv_descript *nd, struct uio *uiop, int siz)
@@ -155,7 +155,7 @@ nfsm_uiombuf(struct nfsrv_descript *nd, struct uio *uiop, 
int siz)
 /*
  * copies a uio scatter/gather list to an mbuf chain.
  * This version returns the mbuf list and does not use "nd".
- * NOTE: can ony handle iovcnt == 1
+ * NOTE: can only handle iovcnt == 1
  */
 struct mbuf *
 nfsm_uiombuflist(struct uio *uiop, int siz, u_int maxext)

git: 8eb774fe54c8 - main - ath: Fix a typo in a source code comment

[Gordon Bergling]

The branch main has been updated by gbe (doc committer):

URL: 
https://cgit.FreeBSD.org/src/commit/?id=8eb774fe54c88a5417a287bd811a917fdfe1c2ba

commit 8eb774fe54c88a5417a287bd811a917fdfe1c2ba
Author: Gordon Bergling 
AuthorDate: 2022-03-27 17:28:49 +
Commit: Gordon Bergling 
CommitDate: 2022-03-27 17:28:49 +

ath: Fix a typo in a source code comment

- s/ony/only/

MFC after:  3 days
---
 sys/dev/ath/ath_hal/ah.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/ath/ath_hal/ah.h b/sys/dev/ath/ath_hal/ah.h
index 4e811a5237ac..8b49a25cc5a9 100644
--- a/sys/dev/ath/ath_hal/ah.h
+++ b/sys/dev/ath/ath_hal/ah.h
@@ -1030,7 +1030,7 @@ typedef struct {
u_int16_t   ss_fft_period;  /* Skip interval for FFT reports */
u_int16_t   ss_period;  /* Spectral scan period */
u_int16_t   ss_count;   /* # of reports to return from 
ss_active */
-   u_int16_t   ss_short_report;/* Set to report ony 1 set of FFT 
results */
+   u_int16_t   ss_short_report;/* Set to report only 1 set of FFT 
results */
u_int8_tradar_bin_thresh_sel;   /* strong signal radar FFT 
threshold configuration */
u_int16_t   ss_spectral_pri;/* are we doing a noise 
power cal ? */
int8_t  ss_nf_cal[AH_MAX_CHAINS*2]; /* nf calibrated values 
for ctl+ext from eeprom */

git: 3e5a11d53a75 - main - libmd: Fix a common typo in the license header

[Gordon Bergling]

The branch main has been updated by gbe (doc committer):

URL: 
https://cgit.FreeBSD.org/src/commit/?id=3e5a11d53a757f05ac1b61942f23f5f0cd9de691

commit 3e5a11d53a757f05ac1b61942f23f5f0cd9de691
Author: Gordon Bergling 
AuthorDate: 2022-03-27 17:46:32 +
Commit: Gordon Bergling 
CommitDate: 2022-03-27 17:46:32 +

libmd: Fix a common typo in the license header

- s/rouines/routines/

Obtained from:  NetBSD
MFC after:  3 days
---
 lib/libmd/ripemd.h   | 2 +-
 lib/libmd/rmd160c.c  | 2 +-
 lib/libmd/rmd_locl.h | 2 +-
 lib/libmd/rmdconst.h | 2 +-
 lib/libmd/sha.h  | 2 +-
 lib/libmd/sha0c.c| 2 +-
 lib/libmd/sha1c.c| 2 +-
 lib/libmd/sha_locl.h | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/libmd/ripemd.h b/lib/libmd/ripemd.h
index f7d0de013273..8f202a53ed84 100644
--- a/lib/libmd/ripemd.h
+++ b/lib/libmd/ripemd.h
@@ -32,7 +32,7 @@
  *must display the following acknowledgement:
  *"This product includes cryptographic software written by
  * Eric Young (e...@cryptsoft.com)"
- *The word 'cryptographic' can be left out if the rouines from the library
+ *The word 'cryptographic' can be left out if the routines from the library
  *being used are not cryptographic related :-).
  * 4. If you include any Windows specific code (or a derivative thereof) from 
  *the apps directory (application code) you must include an 
acknowledgement:
diff --git a/lib/libmd/rmd160c.c b/lib/libmd/rmd160c.c
index a8a4ced70b0a..fa58b7b8735f 100644
--- a/lib/libmd/rmd160c.c
+++ b/lib/libmd/rmd160c.c
@@ -32,7 +32,7 @@
  *must display the following acknowledgement:
  *"This product includes cryptographic software written by
  * Eric Young (e...@cryptsoft.com)"
- *The word 'cryptographic' can be left out if the rouines from the library
+ *The word 'cryptographic' can be left out if the routines from the library
  *being used are not cryptographic related :-).
  * 4. If you include any Windows specific code (or a derivative thereof) from 
  *the apps directory (application code) you must include an 
acknowledgement:
diff --git a/lib/libmd/rmd_locl.h b/lib/libmd/rmd_locl.h
index 49f054c8787c..58d6f2d1e880 100644
--- a/lib/libmd/rmd_locl.h
+++ b/lib/libmd/rmd_locl.h
@@ -32,7 +32,7 @@
  *must display the following acknowledgement:
  *"This product includes cryptographic software written by
  * Eric Young (e...@cryptsoft.com)"
- *The word 'cryptographic' can be left out if the rouines from the library
+ *The word 'cryptographic' can be left out if the routines from the library
  *being used are not cryptographic related :-).
  * 4. If you include any Windows specific code (or a derivative thereof) from 
  *the apps directory (application code) you must include an 
acknowledgement:
diff --git a/lib/libmd/rmdconst.h b/lib/libmd/rmdconst.h
index 59c48dead1ba..f7aa9939fabe 100644
--- a/lib/libmd/rmdconst.h
+++ b/lib/libmd/rmdconst.h
@@ -32,7 +32,7 @@
  *must display the following acknowledgement:
  *"This product includes cryptographic software written by
  * Eric Young (e...@cryptsoft.com)"
- *The word 'cryptographic' can be left out if the rouines from the library
+ *The word 'cryptographic' can be left out if the routines from the library
  *being used are not cryptographic related :-).
  * 4. If you include any Windows specific code (or a derivative thereof) from 
  *the apps directory (application code) you must include an 
acknowledgement:
diff --git a/lib/libmd/sha.h b/lib/libmd/sha.h
index 9e4a5c496657..af32f56bfb5b 100644
--- a/lib/libmd/sha.h
+++ b/lib/libmd/sha.h
@@ -31,7 +31,7 @@
  *must display the following acknowledgement:
  *"This product includes cryptographic software written by
  * Eric Young (e...@cryptsoft.com)"
- *The word 'cryptographic' can be left out if the rouines from the library
+ *The word 'cryptographic' can be left out if the routines from the library
  *being used are not cryptographic related :-).
  * 4. If you include any Windows specific code (or a derivative thereof) from 
  *the apps directory (application code) you must include an 
acknowledgement:
diff --git a/lib/libmd/sha0c.c b/lib/libmd/sha0c.c
index ee4407939598..438c3a4852ff 100644
--- a/lib/libmd/sha0c.c
+++ b/lib/libmd/sha0c.c
@@ -32,7 +32,7 @@
  *must display the following acknowledgement:
  *"This product includes cryptographic software written by
  * Eric Young (e...@cryptsoft.com)"
- *The word 'cryptographic' can be left out if the rouines from the library
+ *The word 'cryptographic' can be left out if the routines from the library
  *being used are not cryptographic related :-).
  * 4. If you include any Windows specific code (or