From b3af768da0f4194b8b809a68f9cd547e117a1619 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Tue, 11 Apr 2023 00:45:06 +0000
Subject: [PATCH] fix double words in comments feedback and ok jmc@ miod, ok
 millert@

---
 sys/arch/alpha/alpha/machdep.c            |  4 ++--
 sys/arch/alpha/alpha/pmap.c               |  6 +++---
 sys/arch/alpha/alpha/vm_machdep.c         |  4 ++--
 sys/arch/alpha/include/autoconf.h         |  4 ++--
 sys/arch/amd64/amd64/pmap.c               |  4 ++--
 sys/arch/amd64/amd64/vm_machdep.c         |  4 ++--
 sys/arch/arm/arm/vm_machdep.c             |  4 ++--
 sys/arch/arm/include/setjmp.h             |  4 ++--
 sys/arch/arm64/arm64/vm_machdep.c         |  4 ++--
 sys/arch/arm64/include/setjmp.h           |  4 ++--
 sys/arch/i386/i386/pmap.c                 |  6 +++---
 sys/arch/i386/i386/pmapae.c               |  4 ++--
 sys/arch/i386/i386/vm_machdep.c           |  4 ++--
 sys/arch/m88k/m88k/db_trace.c             |  4 ++--
 sys/arch/m88k/m88k/vm_machdep.c           |  4 ++--
 sys/arch/macppc/dev/adb.c                 | 10 +++++-----
 sys/arch/macppc/pci/kauaiata.c            |  4 ++--
 sys/arch/powerpc/powerpc/lock_machdep.c   |  4 ++--
 sys/arch/powerpc/powerpc/vm_machdep.c     |  4 ++--
 sys/arch/powerpc64/powerpc64/trap.c       |  4 ++--
 sys/arch/powerpc64/powerpc64/vm_machdep.c |  4 ++--
 sys/arch/riscv64/riscv64/vm_machdep.c     |  4 ++--
 sys/arch/sparc64/dev/psycho.c             |  4 ++--
 sys/dev/fdt/rkpcie.c                      |  4 ++--
 sys/dev/ic/elink3.c                       |  4 ++--
 sys/dev/ic/malo.c                         |  4 ++--
 sys/dev/ic/tcic2reg.h                     |  4 ++--
 sys/dev/ic/twereg.h                       |  4 ++--
 sys/dev/pci/if_de.c                       |  6 +++---
 sys/dev/pci/if_em_hw.c                    |  6 +++---
 sys/dev/pci/if_iwm.c                      |  4 ++--
 sys/dev/pci/if_tl.c                       |  4 ++--
 sys/dev/pv/hypervic.c                     |  2 +-
 sys/dev/pv/xenstore.c                     |  6 +++---
 sys/dev/sbus/stp4020.c                    |  4 ++--
 sys/dev/sdmmc/sdhc.c                      |  4 ++--
 sys/dev/usb/umcs.h                        | 10 +++++-----
 sys/kern/kern_event.c                     |  4 ++--
 sys/kern/sysv_msg.c                       |  4 ++--
 sys/net/hfsc.c                            |  4 ++--
 sys/net/ofp.h                             |  4 ++--
 sys/net80211/ieee80211_node.c             |  4 ++--
 sys/netinet/in.h                          |  4 ++--
 sys/scsi/ch.c                             |  6 +++---
 sys/scsi/scsi_changer.h                   |  4 ++--
 sys/sys/exec_elf.h                        |  4 ++--
 sys/ufs/ffs/ffs_softdep.c                 |  4 ++--
 sys/uvm/uvm_amap.c                        |  4 ++--
 sys/uvm/uvm_anon.c                        |  4 ++--
 sys/uvm/uvm_mmap.c                        |  4 ++--
 sys/uvm/uvm_page.c                        |  4 ++--
 51 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index c4258910480..4541f7c9669 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.202 2023/03/08 04:43:07 guenther Exp $ */
+/* $OpenBSD: machdep.c,v 1.203 2023/04/11 00:45:06 jsg Exp $ */
 /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
 
 /*-
@@ -436,7 +436,7 @@ nobootinfo:
 	/*
 	 * Find out how much memory is available, by looking at
 	 * the memory cluster descriptors.  This also tries to do
-	 * its best to detect things things that have never been seen
+	 * its best to detect things that have never been seen
 	 * before...
 	 */
 	mddtp = (struct mddt *)(((caddr_t)hwrpb) + hwrpb->rpb_memdat_off);
diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c
index 1a2a1ac3807..e07a65e3be7 100644
--- a/sys/arch/alpha/alpha/pmap.c
+++ b/sys/arch/alpha/alpha/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.89 2023/02/06 11:16:22 miod Exp $ */
+/* $OpenBSD: pmap.c,v 1.90 2023/04/11 00:45:07 jsg Exp $ */
 /* $NetBSD: pmap.c,v 1.154 2000/12/07 22:18:55 thorpej Exp $ */
 
 /*-
@@ -286,7 +286,7 @@ struct pool pmap_pv_pool;
  *	* Process B runs.  It is now using the TLB entries tagged
  *	  by process A.  *poof*
  *
- * In the scenario above, in addition to the processor using using incorrect
+ * In the scenario above, in addition to the processor using incorrect
  * TLB entries, the PALcode might use incorrect information to service a
  * TLB miss.  (The PALcode uses the recursively mapped Virtual Page Table
  * to locate the PTE for a faulting address, and tagged TLB entries exist
@@ -301,7 +301,7 @@ struct pool pmap_pv_pool;
  * safe (since PG_ASM mappings match any ASN).
  *
  * On processors that do not support ASNs, the PALcode invalidates
- * the TLB and I-cache automatically on swpctx.  We still still go
+ * the TLB and I-cache automatically on swpctx.  We still go
  * through the motions of assigning an ASN (really, just refreshing
  * the ASN generation in this particular case) to keep the logic sane
  * in other parts of the code.
diff --git a/sys/arch/alpha/alpha/vm_machdep.c b/sys/arch/alpha/alpha/vm_machdep.c
index f034c3786ce..362f9908f9c 100644
--- a/sys/arch/alpha/alpha/vm_machdep.c
+++ b/sys/arch/alpha/alpha/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.50 2023/03/17 19:20:19 miod Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.51 2023/04/11 00:45:07 jsg Exp $ */
 /* $NetBSD: vm_machdep.c,v 1.55 2000/03/29 03:49:48 simonb Exp $ */
 
 /*
@@ -205,7 +205,7 @@ vmapbuf(struct buf *bp, vsize_t len)
 	 * the pmap_extract().
 	 *
 	 * no need to flush TLB since we expect nothing to be mapped
-	 * where we we just allocated (TLB will be flushed when our
+	 * where we just allocated (TLB will be flushed when our
 	 * mapping is removed).
 	 */
 	while (len) {
diff --git a/sys/arch/alpha/include/autoconf.h b/sys/arch/alpha/include/autoconf.h
index c0448bcfa04..6c8d7d29da4 100644
--- a/sys/arch/alpha/include/autoconf.h
+++ b/sys/arch/alpha/include/autoconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.h,v 1.13 2020/05/25 15:00:23 deraadt Exp $ */
+/* $OpenBSD: autoconf.h,v 1.14 2023/04/11 00:45:07 jsg Exp $ */
 /* $NetBSD: autoconf.h,v 1.19 2000/06/08 03:10:06 thorpej Exp $ */
 
 /*
@@ -51,7 +51,7 @@ struct bootdev_data {
 
 /*
  * The boot program passes a pointer (in the boot environment virtual
- * address address space; "BEVA") to a bootinfo to the kernel using
+ * address space; "BEVA") to a bootinfo to the kernel using
  * the following convention:
  *
  *	a0 contains first free page frame number
diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c
index 48e669ff63f..c6c4ebc1b0f 100644
--- a/sys/arch/amd64/amd64/pmap.c
+++ b/sys/arch/amd64/amd64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.162 2023/01/30 11:21:26 deraadt Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.163 2023/04/11 00:45:07 jsg Exp $	*/
 /*	$NetBSD: pmap.c,v 1.3 2003/05/08 18:13:13 thorpej Exp $	*/
 
 /*
@@ -1853,7 +1853,7 @@ pmap_do_remove(struct pmap *pmap, vaddr_t sva, vaddr_t eva, int flags)
 		 * with pmap_remove!  if we allow this (and why would
 		 * we?) then we end up freeing the pmap's page
 		 * directory page (PDP) before we are finished using
-		 * it when we hit in in the recursive mapping.  this
+		 * it when we hit it in the recursive mapping.  this
 		 * is BAD.
 		 *
 		 * long term solution is to move the PTEs out of user
diff --git a/sys/arch/amd64/amd64/vm_machdep.c b/sys/arch/amd64/amd64/vm_machdep.c
index 212865a1c61..8be22524d5d 100644
--- a/sys/arch/amd64/amd64/vm_machdep.c
+++ b/sys/arch/amd64/amd64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.46 2022/08/07 23:56:06 guenther Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.47 2023/04/11 00:45:07 jsg Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.1 2003/04/26 18:39:33 fvdl Exp $	*/
 
 /*-
@@ -172,7 +172,7 @@ vmapbuf(struct buf *bp, vsize_t len)
 	 * the pmap_extract().
 	 *
 	 * no need to flush TLB since we expect nothing to be mapped
-	 * where we we just allocated (TLB will be flushed when our
+	 * where we just allocated (TLB will be flushed when our
 	 * mapping is removed).
 	 */
 	while (len) {
diff --git a/sys/arch/arm/arm/vm_machdep.c b/sys/arch/arm/arm/vm_machdep.c
index 75e19c2d64a..7d89ff5c8a3 100644
--- a/sys/arch/arm/arm/vm_machdep.c
+++ b/sys/arch/arm/arm/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.28 2022/02/21 19:15:58 kettenis Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.29 2023/04/11 00:45:07 jsg Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.31 2004/01/04 11:33:29 jdolecek Exp $	*/
 
 /*
@@ -167,7 +167,7 @@ vmapbuf(struct buf *bp, vsize_t len)
 	 * the pmap_extract().
 	 *
 	 * no need to flush TLB since we expect nothing to be mapped
-	 * where we we just allocated (TLB will be flushed when our
+	 * where we just allocated (TLB will be flushed when our
 	 * mapping is removed).
 	 */
 	while (len) {
diff --git a/sys/arch/arm/include/setjmp.h b/sys/arch/arm/include/setjmp.h
index 02d332c8aa7..d67ddd3abf3 100644
--- a/sys/arch/arm/include/setjmp.h
+++ b/sys/arch/arm/include/setjmp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setjmp.h,v 1.5 2018/06/22 15:18:50 kettenis Exp $	*/
+/*	$OpenBSD: setjmp.h,v 1.6 2023/04/11 00:45:07 jsg Exp $	*/
 /*	$NetBSD: setjmp.h,v 1.2 2001/08/25 14:45:59 bjh21 Exp $	*/
 
 /*
@@ -29,7 +29,7 @@
  *	31	(con't)
  *	32	(con't)
  *
- * The magic number number identifies the jmp_buf and
+ * The magic number identifies the jmp_buf and
  * how the buffer was created as well as providing
  * a sanity check.
  *
diff --git a/sys/arch/arm64/arm64/vm_machdep.c b/sys/arch/arm64/arm64/vm_machdep.c
index d0f0c433311..0d7a19a3254 100644
--- a/sys/arch/arm64/arm64/vm_machdep.c
+++ b/sys/arch/arm64/arm64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.10 2022/07/09 09:25:52 kettenis Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.11 2023/04/11 00:45:07 jsg Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.1 2003/04/26 18:39:33 fvdl Exp $	*/
 
 /*-
@@ -147,7 +147,7 @@ vmapbuf(struct buf *bp, vsize_t len)
 	 * the pmap_extract().
 	 *
 	 * no need to flush TLB since we expect nothing to be mapped
-	 * where we we just allocated (TLB will be flushed when our
+	 * where we just allocated (TLB will be flushed when our
 	 * mapping is removed).
 	 */
 	while (len) {
diff --git a/sys/arch/arm64/include/setjmp.h b/sys/arch/arm64/include/setjmp.h
index ffc83289c0a..e9517a7467a 100644
--- a/sys/arch/arm64/include/setjmp.h
+++ b/sys/arch/arm64/include/setjmp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setjmp.h,v 1.1 2016/12/17 23:38:33 patrick Exp $	*/
+/*	$OpenBSD: setjmp.h,v 1.2 2023/04/11 00:45:07 jsg Exp $	*/
 /*	$NetBSD: setjmp.h,v 1.2 2001/08/25 14:45:59 bjh21 Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
  *	27	(con't)
  *	28	(con't)
  *
- * The magic number number identifies the jmp_buf and
+ * The magic number identifies the jmp_buf and
  * how the buffer was created as well as providing
  * a sanity check.
  *
diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c
index 63b7e1077a6..494425ffee2 100644
--- a/sys/arch/i386/i386/pmap.c
+++ b/sys/arch/i386/i386/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.220 2023/01/30 10:49:05 jsg Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.221 2023/04/11 00:45:07 jsg Exp $	*/
 /*	$NetBSD: pmap.c,v 1.91 2000/06/02 17:46:37 thorpej Exp $	*/
 
 /*
@@ -372,7 +372,7 @@ int nkptp_max = 1024 - (KERNBASE / NBPD) - 1;
 
 /*
  * pg_g_kern:  if CPU is affected by Meltdown pg_g_kern is 0,
- * otherwise it is is set to PG_G.  pmap_pg_g will be derived
+ * otherwise it is set to PG_G.  pmap_pg_g will be derived
  * from pg_g_kern, see pmap_bootstrap().
  */
 extern int pg_g_kern;
@@ -1843,7 +1843,7 @@ pmap_do_remove_86(struct pmap *pmap, vaddr_t sva, vaddr_t eva, int flags)
 		 * with pmap_remove!  if we allow this (and why would
 		 * we?) then we end up freeing the pmap's page
 		 * directory page (PDP) before we are finished using
-		 * it when we hit in in the recursive mapping.  this
+		 * it when we hit it in the recursive mapping.  this
 		 * is BAD.
 		 *
 		 * long term solution is to move the PTEs out of user
diff --git a/sys/arch/i386/i386/pmapae.c b/sys/arch/i386/i386/pmapae.c
index 9acf7044955..b0d7920cacd 100644
--- a/sys/arch/i386/i386/pmapae.c
+++ b/sys/arch/i386/i386/pmapae.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmapae.c,v 1.68 2023/01/30 10:49:05 jsg Exp $	*/
+/*	$OpenBSD: pmapae.c,v 1.69 2023/04/11 00:45:07 jsg Exp $	*/
 
 /*
  * Copyright (c) 2006-2008 Michael Shalayeff
@@ -1267,7 +1267,7 @@ pmap_do_remove_pae(struct pmap *pmap, vaddr_t sva, vaddr_t eva, int flags)
 		 * with pmap_remove!  if we allow this (and why would
 		 * we?) then we end up freeing the pmap's page
 		 * directory page (PDP) before we are finished using
-		 * it when we hit in in the recursive mapping.  this
+		 * it when we hit it in the recursive mapping.  this
 		 * is BAD.
 		 *
 		 * long term solution is to move the PTEs out of user
diff --git a/sys/arch/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c
index 1b2624bcbe6..0b88d891e57 100644
--- a/sys/arch/i386/i386/vm_machdep.c
+++ b/sys/arch/i386/i386/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.73 2023/01/30 10:49:05 jsg Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.74 2023/04/11 00:45:07 jsg Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.61 1996/05/03 19:42:35 christos Exp $	*/
 
 /*-
@@ -162,7 +162,7 @@ vmapbuf(struct buf *bp, vsize_t len)
 	 * the pmap_extract().
 	 *
 	 * no need to flush TLB since we expect nothing to be mapped
-	 * where we we just allocated (TLB will be flushed when our
+	 * where we just allocated (TLB will be flushed when our
 	 * mapping is removed).
 	 */
 	while (len) {
diff --git a/sys/arch/m88k/m88k/db_trace.c b/sys/arch/m88k/m88k/db_trace.c
index 10a719d7962..f6482c2c975 100644
--- a/sys/arch/m88k/m88k/db_trace.c
+++ b/sys/arch/m88k/m88k/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.18 2019/11/08 15:01:15 mpi Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.19 2023/04/11 00:45:07 jsg Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -859,7 +859,7 @@ db_stack_trace_print(db_expr_t addr, int have_addr, db_expr_t count,
 
 		/*
 		 * We've got to find the top of a stack frame so we can get both
-		 * a PC and and real SP.
+		 * a PC and a real SP.
 		 */
 		for (ptr = arg.num;/**/; ptr += 4) {
 			/* Read a word from the named stack */
diff --git a/sys/arch/m88k/m88k/vm_machdep.c b/sys/arch/m88k/m88k/vm_machdep.c
index d0f7cbf7e47..f3e184d8362 100644
--- a/sys/arch/m88k/m88k/vm_machdep.c
+++ b/sys/arch/m88k/m88k/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.27 2022/02/21 19:22:21 kettenis Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.28 2023/04/11 00:45:07 jsg Exp $	*/
 
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
@@ -157,7 +157,7 @@ vmapbuf(struct buf *bp, vsize_t len)
 	 * the pmap_extract().
 	 *
 	 * no need to flush TLB since we expect nothing to be mapped
-	 * where we we just allocated (TLB will be flushed when our
+	 * where we just allocated (TLB will be flushed when our
 	 * mapping is removed).
 	 */
 	while (len) {
diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c
index b94c0285c1e..72939e8db3d 100644
--- a/sys/arch/macppc/dev/adb.c
+++ b/sys/arch/macppc/dev/adb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adb.c,v 1.49 2022/12/26 19:17:00 miod Exp $	*/
+/*	$OpenBSD: adb.c,v 1.50 2023/04/11 00:45:07 jsg Exp $	*/
 /*	$NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $	*/
 /*	$NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $	*/
 
@@ -153,7 +153,7 @@ int	adb_debug;		/* Output debugging messages */
 
 /*
  * This is the delay that is required (in uS) between certain
- * ADB transactions. The actual timing delay for for each uS is
+ * ADB transactions. The actual timing delay for each uS is
  * calculated at boot time to account for differences in machine speed.
  */
 #define ADB_DELAY	150
@@ -203,7 +203,7 @@ u_char	adbOutputBuffer[ADB_MAX_MSG_LENGTH];	/* data output buffer */
 int	adbSentChars;		/* how many characters we have sent */
 
 struct	adbCommand adbInbound[ADB_QUEUE];	/* incoming queue */
-int	adbInCount;			/* how many packets in in queue */
+int	adbInCount;			/* how many packets in queue */
 int	adbInHead;			/* head of in queue */
 int	adbInTail;			/* tail of in queue */
 
@@ -311,7 +311,7 @@ adb_cuda_tickle(void *unused)
 }
 
 /*
- * called when when an adb interrupt happens
+ * called when an adb interrupt happens
  *
  * Cuda version of adb_intr
  * TO DO: do we want to add some calls to intr_dispatch() here to
@@ -627,7 +627,7 @@ send_adb_cuda(u_char * in, u_char * buffer, void *compRout, void *data,
 }
 
 /*
- * Called when when an adb interrupt happens.
+ * Called when an adb interrupt happens.
  * This routine simply transfers control over to the appropriate
  * code for the machine we are running on.
  */
diff --git a/sys/arch/macppc/pci/kauaiata.c b/sys/arch/macppc/pci/kauaiata.c
index 70434472e7c..c776dd4b5b9 100644
--- a/sys/arch/macppc/pci/kauaiata.c
+++ b/sys/arch/macppc/pci/kauaiata.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kauaiata.c,v 1.11 2022/03/13 12:33:01 mpi Exp $ */
+/*	$OpenBSD: kauaiata.c,v 1.12 2023/04/11 00:45:07 jsg Exp $ */
 
 /*
  * Copyright (c) 2003 Dale Rahn
@@ -27,7 +27,7 @@
  */
 
 /*
- * Glue to to attach kauai ata to the macobio_wdc
+ * Glue to attach kauai ata to the macobio_wdc
  * which it heavily resembles.
  */
 
diff --git a/sys/arch/powerpc/powerpc/lock_machdep.c b/sys/arch/powerpc/powerpc/lock_machdep.c
index 8c5fcd77f9c..de008c5bfcd 100644
--- a/sys/arch/powerpc/powerpc/lock_machdep.c
+++ b/sys/arch/powerpc/powerpc/lock_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lock_machdep.c,v 1.10 2021/05/21 00:39:35 gkoehler Exp $	*/
+/*	$OpenBSD: lock_machdep.c,v 1.11 2023/04/11 00:45:07 jsg Exp $	*/
 
 /*
  * Copyright (c) 2021 George Koehler <gkoehler@openbsd.org>
@@ -121,7 +121,7 @@ __ppc_unlock(struct __ppc_lock *mpl)
 
 	/*
 	 * If we get a page fault after membar_exit() and before
-	 * releasing the lock, then then recursive call to
+	 * releasing the lock, then the recursive call to
 	 * __ppc_unlock() must also membar_exit().
 	 */
 	if (mpl->mpl_count == 0) {
diff --git a/sys/arch/powerpc/powerpc/vm_machdep.c b/sys/arch/powerpc/powerpc/vm_machdep.c
index de674db7815..7ffb555f873 100644
--- a/sys/arch/powerpc/powerpc/vm_machdep.c
+++ b/sys/arch/powerpc/powerpc/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.54 2022/10/25 15:15:38 guenther Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.55 2023/04/11 00:45:07 jsg Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.1 1996/09/30 16:34:57 ws Exp $	*/
 
 /*
@@ -194,7 +194,7 @@ vmapbuf(struct buf *bp, vsize_t len)
 	 * the pmap_extract().
 	 *
 	 * no need to flush TLB since we expect nothing to be mapped
-	 * where we we just allocated (TLB will be flushed when our
+	 * where we just allocated (TLB will be flushed when our
 	 * mapping is removed).
 	 */
 	while (len) {
diff --git a/sys/arch/powerpc64/powerpc64/trap.c b/sys/arch/powerpc64/powerpc64/trap.c
index f8e09702b58..a4a386c6d8e 100644
--- a/sys/arch/powerpc64/powerpc64/trap.c
+++ b/sys/arch/powerpc64/powerpc64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.52 2023/01/02 23:03:18 kettenis Exp $	*/
+/*	$OpenBSD: trap.c,v 1.53 2023/04/11 00:45:08 jsg Exp $	*/
 
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
@@ -234,7 +234,7 @@ trap(struct trapframe *frame)
 		 * insert a new SLB entry.  Executing the faulting
 		 * instruction again should result in a Data Storage
 		 * Interrupt that does indicate whether we're dealing
-		 * with with a read or a write fault.
+		 * with a read or a write fault.
 		 */
 		map = &p->p_vmspace->vm_map;
 		vm_map_lock_read(map);
diff --git a/sys/arch/powerpc64/powerpc64/vm_machdep.c b/sys/arch/powerpc64/powerpc64/vm_machdep.c
index 42a29ab55f8..522d63cfaca 100644
--- a/sys/arch/powerpc64/powerpc64/vm_machdep.c
+++ b/sys/arch/powerpc64/powerpc64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.8 2021/05/16 06:20:29 jsg Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.9 2023/04/11 00:45:08 jsg Exp $	*/
 
 /*-
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
@@ -158,7 +158,7 @@ vmapbuf(struct buf *bp, vsize_t len)
 	 * the pmap_extract().
 	 *
 	 * no need to flush TLB since we expect nothing to be mapped
-	 * where we we just allocated (TLB will be flushed when our
+	 * where we just allocated (TLB will be flushed when our
 	 * mapping is removed).
 	 */
 	while (len) {
diff --git a/sys/arch/riscv64/riscv64/vm_machdep.c b/sys/arch/riscv64/riscv64/vm_machdep.c
index fd4caec1d6d..a539b1c357a 100644
--- a/sys/arch/riscv64/riscv64/vm_machdep.c
+++ b/sys/arch/riscv64/riscv64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.10 2022/02/24 14:19:10 visa Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.11 2023/04/11 00:45:08 jsg Exp $	*/
 
 /*-
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
@@ -149,7 +149,7 @@ vmapbuf(struct buf *bp, vsize_t len)
 	 * the pmap_extract().
 	 *
 	 * no need to flush TLB since we expect nothing to be mapped
-	 * where we we just allocated (TLB will be flushed when our
+	 * where we just allocated (TLB will be flushed when our
 	 * mapping is removed).
 	 */
 	while (len) {
diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c
index 033f5170c62..f3c5b29a30a 100644
--- a/sys/arch/sparc64/dev/psycho.c
+++ b/sys/arch/sparc64/dev/psycho.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psycho.c,v 1.82 2023/02/04 19:19:37 cheloha Exp $	*/
+/*	$OpenBSD: psycho.c,v 1.83 2023/04/11 00:45:08 jsg Exp $	*/
 /*	$NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $	*/
 
 /*
@@ -1291,7 +1291,7 @@ found:
 	/*
 	 * Enable the interrupt now we have the handler installed.
 	 * Read the current value as we can't change it besides the
-	 * valid bit so so make sure only this bit is changed.
+	 * valid bit so make sure only this bit is changed.
 	 *
 	 * XXXX --- we really should use bus_space for this.
 	 */
diff --git a/sys/dev/fdt/rkpcie.c b/sys/dev/fdt/rkpcie.c
index 3cd05af2b45..78fe0a4932b 100644
--- a/sys/dev/fdt/rkpcie.c
+++ b/sys/dev/fdt/rkpcie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rkpcie.c,v 1.16 2022/01/09 05:42:37 jsg Exp $	*/
+/*	$OpenBSD: rkpcie.c,v 1.17 2023/04/11 00:45:08 jsg Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -168,7 +168,7 @@ void	rkpcie_intr_disestablish(void *, void *);
  * It is important to have reached L0 state before beginning Gen 2 training,
  * as it is documented that setting the Retrain Link bit while currently
  * in Recovery or Configuration states is a race condition that may result
- * in missing the retraining. See See PCIE 2.0 Base Specification, 7.8.7
+ * in missing the retraining. See PCIE 2.0 Base Specification, 7.8.7
  * Link Control Register implementation notes on Retrain Link bit.
  */
 
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index 46a920d2b3a..ccec2d00ac7 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elink3.c,v 1.98 2020/12/12 11:48:52 jan Exp $	*/
+/*	$OpenBSD: elink3.c,v 1.99 2023/04/11 00:45:08 jsg Exp $	*/
 /*	$NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $	*/
 
 /*
@@ -609,7 +609,7 @@ epinit(struct ep_softc *sc)
 	for (i = 0; i < 31; i++)
 		bus_space_read_1(iot, ioh, ep_w1_reg(sc, EP_W1_TX_STATUS));
 
-	/* Set threshold for for Tx-space available interrupt. */
+	/* Set threshold for Tx-space available interrupt. */
 	bus_space_write_2(iot, ioh, EP_COMMAND,
 	    SET_TX_AVAIL_THRESH | (1600 >> sc->txashift));
 
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index ab5511d082c..ef922c00648 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malo.c,v 1.123 2022/04/21 21:03:02 stsp Exp $ */
+/*	$OpenBSD: malo.c,v 1.124 2023/04/11 00:45:08 jsg Exp $ */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -1662,7 +1662,7 @@ malo_rx_intr(struct malo_softc *sc)
 		}
 
 		/*
-		 * New mbuf mbuf successfully loaded
+		 * New mbuf successfully loaded
 		 */
 		m = data->m;
 		data->m = mnew;
diff --git a/sys/dev/ic/tcic2reg.h b/sys/dev/ic/tcic2reg.h
index 236a6879f76..b8d12b95b4f 100644
--- a/sys/dev/ic/tcic2reg.h
+++ b/sys/dev/ic/tcic2reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcic2reg.h,v 1.5 2022/01/09 05:42:42 jsg Exp $	*/
+/*	$OpenBSD: tcic2reg.h,v 1.6 2023/04/11 00:45:08 jsg Exp $	*/
 /*	$NetBSD: tcic2reg.h,v 1.1 1999/03/23 20:04:14 bad Exp $	*/
 
 /*-
@@ -304,7 +304,7 @@
 	/*
 	 * If set, use full address (a[12:23]) for MCS16 generation.
 	 * If clear, run in ISA-compatible mode (only using a[17:23]).
-	 * With many chip sets, the TCIC-2/N's timing will will allow full
+	 * With many chip sets, the TCIC-2/N's timing will allow full
 	 * address decoding to be used rather than limiting us to LA[17:23];
 	 * thus we can get around the ISA spec which limits the granularity
 	 * of bus sizing to 128K blocks.
diff --git a/sys/dev/ic/twereg.h b/sys/dev/ic/twereg.h
index 53d24492caa..72c6ea5fa3e 100644
--- a/sys/dev/ic/twereg.h
+++ b/sys/dev/ic/twereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: twereg.h,v 1.9 2008/09/01 17:30:56 deraadt Exp $	*/
+/*	$OpenBSD: twereg.h,v 1.10 2023/04/11 00:45:08 jsg Exp $	*/
 
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -108,7 +108,7 @@
  * From 3ware's documentation:
  *
  *   All parameters maintained by the controller are grouped into related
- *   tables.  Tables are are accessed indirectly via get and set parameter
+ *   tables.  Tables are accessed indirectly via get and set parameter
  *   commands.  To access a specific parameter in a table, the table ID and
  *   parameter index are used to uniquely identify a parameter.  Table
  *   0xffff is the directory table and provides a list of the table IDs and
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index a4ef36cd42e..b178a4aeeef 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.141 2022/08/15 02:07:11 jsg Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.142 2023/04/11 00:45:08 jsg Exp $	*/
 /*	$NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $	*/
 
 /*-
@@ -960,7 +960,7 @@ tulip_21041_media_poll(tulip_softc_t * const sc, const tulip_mediapoll_event_t e
     }
 
     /*
-     * If we've been been asked to start a poll or link change interrupt
+     * If we've been asked to start a poll or link change interrupt
      * restart the probe (and reset the tulip to a known state).
      */
     if (event == TULIP_MEDIAPOLL_START) {
@@ -3747,7 +3747,7 @@ tulip_txput(tulip_softc_t * const sc, struct mbuf *m, int notonqueue)
      * a bit reminiscent of going on the Ark two by two
      * since each descriptor for the TULIP can describe
      * two buffers.  So we advance through packet filling
-     * each of the two entries at a time to to fill each
+     * each of the two entries at a time to fill each
      * descriptor.  Clear the first and last segment bits
      * in each descriptor (actually just clear everything
      * but the end-of-ring or chain bits) to make sure
diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c
index 6d230587e99..7db048d482a 100644
--- a/sys/dev/pci/if_em_hw.c
+++ b/sys/dev/pci/if_em_hw.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/* $OpenBSD: if_em_hw.c,v 1.116 2022/06/23 09:47:04 jsg Exp $ */
+/* $OpenBSD: if_em_hw.c,v 1.117 2023/04/11 00:45:08 jsg Exp $ */
 /*
  * if_em_hw.c Shared functions for accessing and configuring the MAC
  */
@@ -3975,7 +3975,7 @@ em_force_mac_fc(struct em_hw *hw)
 	 * The possible values of the "fc" parameter are: 0:  Flow control is
 	 * completely disabled 1:  Rx flow control is enabled (we can receive
 	 * pause frames but not send pause frames). 2:  Tx flow control is
-	 * enabled (we can send pause frames frames but we do not receive
+	 * enabled (we can send pause frames but we do not receive
 	 * pause frames). 3:  Both Rx and TX flow control (symmetric) is
 	 * enabled. other:  No other values should be possible at this point.
 	 */
@@ -4466,7 +4466,7 @@ em_check_for_link(struct em_hw *hw)
 				 * TBI link partner, we will store bad
 				 * packets. Some frames have an additional
 				 * byte on the end and will look like CRC
-				 * errors to to the hardware.
+				 * errors to the hardware.
 				 */
 				if (!hw->tbi_compatibility_on) {
 					hw->tbi_compatibility_on = TRUE;
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c
index 437a2b9f372..6c75baca82c 100644
--- a/sys/dev/pci/if_iwm.c
+++ b/sys/dev/pci/if_iwm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwm.c,v 1.405 2022/12/16 13:49:35 stsp Exp $	*/
+/*	$OpenBSD: if_iwm.c,v 1.406 2023/04/11 00:45:08 jsg Exp $	*/
 
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -10121,7 +10121,7 @@ iwm_send_paging_cmd(struct iwm_softc *sc, const struct iwm_fw_sects *fw)
 		.block_num = htole32(sc->num_of_paging_blk),
 	};
 
-	/* loop for for all paging blocks + CSS block */
+	/* loop for all paging blocks + CSS block */
 	for (blk_idx = 0; blk_idx < sc->num_of_paging_blk + 1; blk_idx++) {
 		dev_phy_addr = htole32(
 		    sc->fw_paging_db[blk_idx].fw_paging_block.paddr >>
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 961189859db..bea6f1ba0e6 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tl.c,v 1.76 2022/03/11 18:00:50 mpi Exp $	*/
+/*	$OpenBSD: if_tl.c,v 1.77 2023/04/11 00:45:08 jsg Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -1015,7 +1015,7 @@ tl_newbuf(struct tl_softc *sc, struct tl_chain_onefrag *c)
  * into mbufs. This saves us from having to do a buffer copy: we can
  * just hand the mbufs directly to the network stack. Once the frame
  * has been sent on its way, the 'list' structure is assigned a new
- * buffer and moved to the end of the RX chain. As long we we stay
+ * buffer and moved to the end of the RX chain. As long we stay
  * ahead of the chip, it will always think it has an endless receive
  * channel.
  *
diff --git a/sys/dev/pv/hypervic.c b/sys/dev/pv/hypervic.c
index a7455d03e5b..b3ce2d91bea 100644
--- a/sys/dev/pv/hypervic.c
+++ b/sys/dev/pv/hypervic.c
@@ -889,7 +889,7 @@ kvp_get_ip_info(struct hv_kvp *kvp, const uint8_t *mac, uint8_t *family,
 	TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) {
 		/*
 		 * First IPv4 address is always a best match unless
-		 * we were asked for for an IPv6 address.
+		 * we were asked for an IPv6 address.
 		 */
 		if ((af == AF_INET || af == AF_UNSPEC) &&
 		    (ifa->ifa_addr->sa_family == AF_INET)) {
diff --git a/sys/dev/pv/xenstore.c b/sys/dev/pv/xenstore.c
index 1f4c2307bdd..27199590fbd 100644
--- a/sys/dev/pv/xenstore.c
+++ b/sys/dev/pv/xenstore.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xenstore.c,v 1.48 2023/01/07 06:40:21 asou Exp $	*/
+/*	$OpenBSD: xenstore.c,v 1.49 2023/04/11 00:45:08 jsg Exp $	*/
 
 /*
  * Copyright (c) 2015 Mike Belopuhov
@@ -471,7 +471,7 @@ xs_ring_put(struct xs_softc *xs, void *src, size_t size)
 	size = MIN(size, avail);
 	/* How many contiguous bytes can we memcpy... */
 	left = XS_RING_SIZE - prod;
-	/* ...bounded by by how much we need to write? */
+	/* ...bounded by how much we need to write? */
 	left = MIN(left, size);
 
 	memcpy(&xsr->xsr_req[prod], src, left);
@@ -498,7 +498,7 @@ xs_ring_get(struct xs_softc *xs, void *dst, size_t size)
 	size = MIN(size, avail);
 	/* How many contiguous bytes can we memcpy... */
 	left = XS_RING_SIZE - cons;
-	/* ...bounded by by how much we need to read? */
+	/* ...bounded by how much we need to read? */
 	left = MIN(left, size);
 
 	memcpy(dst, &xsr->xsr_rsp[cons], left);
diff --git a/sys/dev/sbus/stp4020.c b/sys/dev/sbus/stp4020.c
index 8d469dadc2e..744e4313bf0 100644
--- a/sys/dev/sbus/stp4020.c
+++ b/sys/dev/sbus/stp4020.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stp4020.c,v 1.22 2020/02/18 00:10:22 cheloha Exp $	*/
+/*	$OpenBSD: stp4020.c,v 1.23 2023/04/11 00:45:09 jsg Exp $	*/
 /*	$NetBSD: stp4020.c,v 1.23 2002/06/01 23:51:03 lukem Exp $	*/
 
 /*-
@@ -796,7 +796,7 @@ stp4020_chip_intr_establish(pcmcia_chipset_handle_t pch,
 	/*
 	 * Note that this code relies on softintr_establish() to be
 	 * used with real, hardware ipl values. All platforms with
-	 * SBus support support this.
+	 * SBus support this.
 	 */
 	h->intrhandler = handler;
 	h->intrarg = arg;
diff --git a/sys/dev/sdmmc/sdhc.c b/sys/dev/sdmmc/sdhc.c
index ce748b515ec..2ed10fea48b 100644
--- a/sys/dev/sdmmc/sdhc.c
+++ b/sys/dev/sdmmc/sdhc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdhc.c,v 1.73 2022/01/19 10:51:04 patrick Exp $	*/
+/*	$OpenBSD: sdhc.c,v 1.74 2023/04/11 00:45:09 jsg Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -149,7 +149,7 @@ struct cfdriver sdhc_cd = {
  * for the Transfer Mode register that we write out when we write the
  * Command register.
  *
- * The Arasan controller controller integrated on the Broadcom SoCs
+ * The Arasan controller integrated on the Broadcom SoCs
  * used in the Raspberry Pi has an interesting bug where writing the
  * same 32-bit register twice doesn't work.  This means that we lose
  * writes to the Block Sine and/or Block Count register.  We work
diff --git a/sys/dev/usb/umcs.h b/sys/dev/usb/umcs.h
index af0316b559e..3062d7dc28b 100644
--- a/sys/dev/usb/umcs.h
+++ b/sys/dev/usb/umcs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: umcs.h,v 1.5 2022/02/21 12:41:39 jsg Exp $ */
+/* $OpenBSD: umcs.h,v 1.6 2023/04/11 00:45:09 jsg Exp $ */
 /* $NetBSD: umcs.h,v 1.1 2014/03/16 09:34:45 martin Exp $ */
 
 /*-
@@ -48,7 +48,7 @@
  * All these registers are documented only in full datasheet, which
  * can be requested from MosChip tech support.
  */
-#define	UMCS_SP1		0x00	/* Options for for UART 1, R/W */
+#define	UMCS_SP1		0x00	/* Option bits for UART 1, R/W */
 #define	UMCS_CTRL1		0x01	/* Control bits for UART 1, R/W */
 #define	UMCS_PINPONGHIGH	0x02	/* High bits of ping-pong reg, R/W */
 #define	UMCS_PINPONGLOW		0x03	/* Low bits of ping-pong reg, R/W */
@@ -56,11 +56,11 @@
 
 /* DCRx_1 Registers goes here (see below, they are documented) */
 #define	UMCS_GPIO		0x07	/* GPIO_0 and GPIO_1 bits, R/W */
-#define	UMCS_SP2		0x08	/* Options for for UART 2, R/W */
+#define	UMCS_SP2		0x08	/* Option bits for UART 2, R/W */
 #define	UMCS_CTRL2		0x09	/* Control bits for UART 2, R/W */
-#define	UMCS_SP3		0x0a	/* Options for for UART 3, R/W */
+#define	UMCS_SP3		0x0a	/* Option bits for UART 3, R/W */
 #define	UMCS_CTRL3		0x0b	/* Control bits for UART 3, R/W */
-#define	UMCS_SP4		0x0c	/* Options for for UART 4, R/W */
+#define	UMCS_SP4		0x0c	/* Option bits for UART 4, R/W */
 #define	UMCS_CTRL4		0x0d	/* Control bits for UART 4, R/W */
 #define	UMCS_PLL_DIV_M		0x0e	/* Pre-divider for PLL, R/W */
 #define	UMCS_UNKNOWN1		0x0f	/* NOT MENTIONED AND NOT USED */
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index a31c036a8a5..fabc238ce3e 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_event.c,v 1.195 2023/02/10 14:34:17 visa Exp $	*/
+/*	$OpenBSD: kern_event.c,v 1.196 2023/04/11 00:45:09 jsg Exp $	*/
 
 /*-
  * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
@@ -172,7 +172,7 @@ int kq_timeoutmax = (4 * 1024);
 #define KN_HASH(val, mask)	(((val) ^ (val >> 8)) & (mask))
 
 /*
- * Table for for all system-defined filters.
+ * Table for all system-defined filters.
  */
 const struct filterops *const sysfilt_ops[] = {
 	&file_filtops,			/* EVFILT_READ */
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 9fb57c4dedf..fe07031bf90 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysv_msg.c,v 1.40 2022/09/16 15:57:23 mbuhl Exp $	*/
+/*	$OpenBSD: sysv_msg.c,v 1.41 2023/04/11 00:45:09 jsg Exp $	*/
 /*	$NetBSD: sysv_msg.c,v 1.19 1996/02/09 19:00:18 christos Exp $	*/
 /*
  * Copyright (c) 2009 Bret S. Lambert <blambert@openbsd.org>
@@ -561,7 +561,7 @@ msg_dequeue(struct que *que, struct msg *msg, struct proc *p)
  * The data to be copied is laid out as a single userspace buffer, with a
  * long preceding an opaque buffer of len bytes. The long value ends
  * up being the message type, which needs to be copied separately from
- * the buffer data, which is stored in in mbufs.
+ * the buffer data, which is stored in mbufs.
  */
 
 int
diff --git a/sys/net/hfsc.c b/sys/net/hfsc.c
index 006c83d6808..88f150ed2da 100644
--- a/sys/net/hfsc.c
+++ b/sys/net/hfsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hfsc.c,v 1.48 2018/10/22 23:44:53 dlg Exp $	*/
+/*	$OpenBSD: hfsc.c,v 1.49 2023/04/11 00:45:09 jsg Exp $	*/
 
 /*
  * Copyright (c) 2012-2013 Henning Brauer <henning@openbsd.org>
@@ -72,7 +72,7 @@
  *	representation.
  *	the slope values are scaled to avoid overflow.
  *	the inverse slope values as well as the y-projection of the 1st
- *	segment are kept in order to to avoid 64-bit divide operations
+ *	segment are kept in order to avoid 64-bit divide operations
  *	that are expensive on 32-bit architectures.
  *
  *  note: Intel Pentium TSC never wraps around in several thousands of years.
diff --git a/sys/net/ofp.h b/sys/net/ofp.h
index f57b582f112..2349127215c 100644
--- a/sys/net/ofp.h
+++ b/sys/net/ofp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ofp.h,v 1.14 2021/03/10 10:21:48 jsg Exp $	*/
+/*	$OpenBSD: ofp.h,v 1.15 2023/04/11 00:45:09 jsg Exp $	*/
 
 /*
  * Copyright (c) 2013-2016 Reyk Floeter <reyk@openbsd.org>
@@ -193,7 +193,7 @@ struct ofp_match {
 	uint16_t	om_length;
 } __packed;
 
-/* Flow matching type type */
+/* Flow matching type */
 #define OFP_MATCH_STANDARD		0	/* Standard match deprecated */
 #define OFP_MATCH_OXM			1	/* OpenFlow Extensible Match */
 
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index f3bb6dd1eef..c1a06bc7ca6 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_node.c,v 1.195 2022/03/20 07:50:32 stsp Exp $	*/
+/*	$OpenBSD: ieee80211_node.c,v 1.196 2023/04/11 00:45:09 jsg Exp $	*/
 /*	$NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $	*/
 
 /*-
@@ -1881,7 +1881,7 @@ ieee80211_find_txnode(struct ieee80211com *ic, const u_int8_t *macaddr)
 		/*
 		 * Fake up a node; this handles node discovery in
 		 * adhoc mode.  Note that for the driver's benefit
-		 * we we treat this like an association so the driver
+		 * we treat this like an association so the driver
 		 * has an opportunity to setup its private state.
 		 *
 		 * XXX need better way to handle this; issue probe
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 432a483f778..4fc6f3a58bc 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in.h,v 1.141 2021/06/02 00:09:57 dlg Exp $	*/
+/*	$OpenBSD: in.h,v 1.142 2023/04/11 00:45:09 jsg Exp $	*/
 /*	$NetBSD: in.h,v 1.20 1996/02/13 23:41:47 christos Exp $	*/
 
 /*
@@ -136,7 +136,7 @@ typedef __in_port_t	in_port_t;	/* IP port type */
  * sysctl(3).  (net.inet.ip.port{hi}{first,last})
  *
  * Changing those values has bad security implications if you are
- * using a a stateless firewall that is allowing packets outside of that
+ * using a stateless firewall that is allowing packets outside of that
  * range in order to allow transparent outgoing connections.
  *
  * Such a firewall configuration will generally depend on the use of these
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index 093b5128d58..f7bc669b967 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ch.c,v 1.71 2022/01/11 23:10:11 jsg Exp $	*/
+/*	$OpenBSD: ch.c,v 1.72 2023/04/11 00:45:09 jsg Exp $	*/
 /*	$NetBSD: ch.c,v 1.26 1997/02/21 22:06:52 thorpej Exp $	*/
 
 /*
@@ -162,7 +162,7 @@ chattach(struct device *parent, struct device *self, void *aux)
 	printf("\n");
 
 	/*
-	 * Store our our device's quirks.
+	 * Store our device's quirks.
 	 */
 	ch_get_quirks(sc, &link->inqdata);
 }
@@ -510,7 +510,7 @@ copy_voltag(struct changer_voltag *uvoltag, struct volume_tag *voltag)
 }
 
 /*
- * Copy an an element status descriptor to a user-mode
+ * Copy an element status descriptor to a user-mode
  * changer_element_status structure.
  */
 static void
diff --git a/sys/scsi/scsi_changer.h b/sys/scsi/scsi_changer.h
index 7713aa514af..dca290351f5 100644
--- a/sys/scsi/scsi_changer.h
+++ b/sys/scsi/scsi_changer.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi_changer.h,v 1.10 2022/01/11 23:10:11 jsg Exp $	*/
+/*	$OpenBSD: scsi_changer.h,v 1.11 2023/04/11 00:45:09 jsg Exp $	*/
 /*	$NetBSD: scsi_changer.h,v 1.7 1996/04/03 00:25:48 thorpej Exp $	*/
 
 /*
@@ -338,7 +338,7 @@ struct page_device_capabilities {
  * Some of these fields can be a little confusing, so an explanation
  * is in order.
  *
- * Each component within a a medium changer apparatus is called an
+ * Each component within a medium changer apparatus is called an
  * "element".
  *
  * The "medium transport element address" is the address of the first
diff --git a/sys/sys/exec_elf.h b/sys/sys/exec_elf.h
index 13ccc826b44..0547610ae03 100644
--- a/sys/sys/exec_elf.h
+++ b/sys/sys/exec_elf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_elf.h,v 1.97 2022/10/27 23:17:18 deraadt Exp $	*/
+/*	$OpenBSD: exec_elf.h,v 1.98 2023/04/11 00:45:09 jsg Exp $	*/
 /*
  * Copyright (c) 1995, 1996 Erik Theisen.  All rights reserved.
  *
@@ -645,7 +645,7 @@ typedef struct {
  *	NT_OPENBSD_PROCINFO
  *		Note is a "elfcore_procinfo" structure.
  *	NT_OPENBSD_AUXV
- *		Note is a a bunch of Auxiliary Vectors, terminated by
+ *		Note is a bunch of Auxiliary Vectors, terminated by
  *		an AT_NULL entry.
  *	NT_OPENBSD_REGS
  *		Note is a "reg" structure.
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 99abc3cc76c..15017537b41 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_softdep.c,v 1.150 2021/04/28 09:53:53 claudio Exp $	*/
+/*	$OpenBSD: ffs_softdep.c,v 1.151 2023/04/11 00:45:09 jsg Exp $	*/
 
 /*
  * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -1926,7 +1926,7 @@ softdep_setup_freeblocks(struct inode *ip, off_t length)
 	DIP_ASSIGN(ip, size, 0);
 
 	/*
-	 * Push the zero'ed inode to to its disk buffer so that we are free
+	 * Push the zero'ed inode to its disk buffer so that we are free
 	 * to delete its dependencies below. Once the dependencies are gone
 	 * the buffer can be safely released.
 	 */
diff --git a/sys/uvm/uvm_amap.c b/sys/uvm/uvm_amap.c
index d2154808797..63dc8534081 100644
--- a/sys/uvm/uvm_amap.c
+++ b/sys/uvm/uvm_amap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_amap.c,v 1.91 2022/08/01 14:15:46 mpi Exp $	*/
+/*	$OpenBSD: uvm_amap.c,v 1.92 2023/04/11 00:45:09 jsg Exp $	*/
 /*	$NetBSD: uvm_amap.c,v 1.27 2000/11/25 06:27:59 chs Exp $	*/
 
 /*
@@ -597,7 +597,7 @@ amap_copy(struct vm_map *map, struct vm_map_entry *entry, int waitf,
 	 * First check and see if we are the only map entry referencing
 	 * he amap we currently have.  If so, then just take it over instead
 	 * of copying it.  Note that we are reading am_ref without lock held
-	 * as the value value can only be one if we have the only reference
+	 * as the value can only be one if we have the only reference
 	 * to the amap (via our locked map).  If the value is greater than
 	 * one, then allocate amap and re-check the value.
 	 */
diff --git a/sys/uvm/uvm_anon.c b/sys/uvm/uvm_anon.c
index 496df417e07..13d36f2789d 100644
--- a/sys/uvm/uvm_anon.c
+++ b/sys/uvm/uvm_anon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_anon.c,v 1.54 2021/03/26 13:40:05 mpi Exp $	*/
+/*	$OpenBSD: uvm_anon.c,v 1.55 2023/04/11 00:45:09 jsg Exp $	*/
 /*	$NetBSD: uvm_anon.c,v 1.10 2000/11/25 06:27:59 chs Exp $	*/
 
 /*
@@ -103,7 +103,7 @@ uvm_anfree_list(struct vm_anon *anon, struct pglist *pgl)
 		pmap_page_protect(pg, PROT_NONE);
 		if (pgl != NULL) {
 			/*
-			 * clean page, and put on on pglist
+			 * clean page, and put it on pglist
 			 * for later freeing.
 			 */
 			uvm_lock_pageq();
diff --git a/sys/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c
index 6d00d80b7f9..69087134785 100644
--- a/sys/uvm/uvm_mmap.c
+++ b/sys/uvm/uvm_mmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_mmap.c,v 1.180 2023/03/08 04:43:09 guenther Exp $	*/
+/*	$OpenBSD: uvm_mmap.c,v 1.181 2023/04/11 00:45:09 jsg Exp $	*/
 /*	$NetBSD: uvm_mmap.c,v 1.49 2001/02/18 21:19:08 chs Exp $	*/
 
 /*
@@ -1249,7 +1249,7 @@ sys_kbind(struct proc *p, void *v, register_t *retval)
 		else
 			s -= extra;
 redo:
-		/* make sure sure the desired page is mapped into kernel_map */
+		/* make sure the desired page is mapped into kernel_map */
 		if (baseva != last_baseva) {
 			if (kva != 0) {
 				vm_map_lock(kernel_map);
diff --git a/sys/uvm/uvm_page.c b/sys/uvm/uvm_page.c
index 020cfb56765..c4eb92d8641 100644
--- a/sys/uvm/uvm_page.c
+++ b/sys/uvm/uvm_page.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_page.c,v 1.170 2022/08/29 02:58:13 jsg Exp $	*/
+/*	$OpenBSD: uvm_page.c,v 1.171 2023/04/11 00:45:09 jsg Exp $	*/
 /*	$NetBSD: uvm_page.c,v 1.44 2000/11/27 08:40:04 chs Exp $	*/
 
 /*
@@ -1158,7 +1158,7 @@ vm_physseg_find(paddr_t pframe, int *offp)
 	int	start, len, try;
 
 	/*
-	 * if try is too large (thus target is less than than try) we reduce
+	 * if try is too large (thus target is less than try) we reduce
 	 * the length to trunc(len/2) [i.e. everything smaller than "try"]
 	 *
 	 * if the try is too small (thus target is greater than try) then
-- 
2.20.1