diff --git a/distrib/amd64/Makefile b/distrib/amd64/Makefile
index ba8c513e2..52c19d91b 100644
--- a/distrib/amd64/Makefile
+++ b/distrib/amd64/Makefile
@@ -1,6 +1,6 @@
 #	$OpenBSD: Makefile,v 1.5 2019/04/30 20:38:30 deraadt Exp $
 
-SUBDIR= ramdisk_cd
+SUBDIR= ramdisk_cd ramdiskA
 
 .if	make(obj) || make(cleandir) || make(clean)
 SUBDIR+= iso
@@ -8,5 +8,6 @@ SUBDIR+= iso
 
 unconfig:
 	cd ramdisk_cd; ${MAKE} unconfig
+	cd ramdiskA; ${MAKE} unconfig
 
 .include <bsd.subdir.mk>
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index 483d8e819..3fec986b6 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -34,8 +34,6 @@
 ./etc/skel/.login
 ./etc/skel/.mailrc
 ./etc/skel/.profile
-./etc/skel/.version
-./etc/skel/.xsession
 ./etc/skel/.ssh/authorized_keys
 ./etc/spwd.db
 ./etc/ssh/ssh_config
diff --git a/etc/Makefile b/etc/Makefile
index 5b5aa543c..b2d862ff4 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -134,10 +134,6 @@ distribution-etc-root-var: distrib-dirs
 		    ${DESTDIR}/etc/skel/.mailrc; \
 		${INSTALL} -c -o root -g wheel -m 644 dot.profile \
 		    ${DESTDIR}/etc/skel/.profile; \
-		${INSTALL} -c -o root -g wheel -m 644 dot.version \
-		    ${DESTDIR}/etc/skel/.version; \
-		${INSTALL} -c -o root -g wheel -m 644 dot.xsession \
-		    ${DESTDIR}/etc/skel/.xsession; \
 		${INSTALL} -c -o root -g wheel -m 644 dot.Xdefaults \
 		    ${DESTDIR}/etc/skel/.Xdefaults; \
 		${INSTALL} -c -o root -g wheel -m 644 dot.cvsrc \
diff --git a/etc/skel/dot.version b/etc/skel/dot.version
deleted file mode 100644
index 3b4598f6b..000000000
--- a/etc/skel/dot.version
+++ /dev/null
@@ -1 +0,0 @@
-# SecBSD 1.6-dcc2b9c: Sun Sep  1 00:00:00 UTC 2024 (Yatagarasu)
diff --git a/etc/skel/dot.xsession b/etc/skel/dot.xsession
deleted file mode 100644
index 4c82ae9bf..000000000
--- a/etc/skel/dot.xsession
+++ /dev/null
@@ -1,67 +0,0 @@
-# $SecBSD: dot.xsession,v 0.5 2024/08/21 05:14:40 purplerain Exp $
-#
-# This file is for testing purposes only.
-
-export LANG=en_US.UTF-8
-export LC_CTYPE=en_US.UTF-8
-
-xset b 0 0 0
-
-if [ -x /usr/local/bin/dbus-launch -a -z "${DBUS_SESSION_BUS_ADDRESS}" ]; then
-	eval `dbus-launch --sh-syntax --exit-with-x11`
-fi
-
-#cwm + xenodm + termbar
-#vi ~/.cwmrc to create default cwm configuration file
-#configure according to your needs and save :wq!
-#manual: https://man.openbsd.org/cwm.1
-#uncomment lines below
-#xterm -geometry 320x1+0+0 -fa "Spleen:size=16" -bg "black" \
-#      -fg grey -fs 12 -name bar -class bar \
-#      -T bar -e ~/.bar &
-#
-#cwm
-#rcctl enable xenodm
-#rcctl start xenodm
-#reboot
-
-
-#XFCE Desktop + xenodm
-#pkg_add -v xfce xfce-extras consolekit2
-#uncomment line below
-#/usr/local/bin/startxfce4 --with-ck-launch
-#rcctl enable messagebus xenodm
-#rcctl start messagebus xenodm
-#reboot
-
-
-#KDE Plasma + xenodm
-#pkg_add -v kde-plasma
-#uncomment lines below
-#export XDG_RUNTIME_DIR=/tmp/run/$(id -u)
-#if [ ! -d $XDG_RUNTIME_DIR ]; then
-#    mkdir -m 700 -p $XDG_RUNTIME_DIR
-#fi
-#
-#export QT_FORCE_STDERR_LOGGING=1
-#export XDG_CURRENT_DESKTOP=KDE
-#export DESKTOP_SESSION=plasma
-#export QT_FORCE_STDERR_LOGGING=1
-#/usr/local/bin/startplasma-x11 > ~/.startplasma-x11.log 2>&1
-#rcctl enable messagebus xenodm
-#rcctl start messagebus xenodm
-#reboot
-
-#Known issues
-#
-#The KDE compositor does not seem to run properly by default. It is recommended
-#to deactivate this under: "System Setting" -> "Display Configuration" ->
-#"Compositor"
-
-#No compositor seem to run by default.
-#You can't unlock your session when the screensaver has locked it. I get the
-#graphical message "Something wrong happened. Run # ck-unlock-session ...".
-#So you will end up with a freezen session that you have to completely kill.
-#It is recommended to disable KDE screen locking for now.
-#The first start may take a little longer.
-#The sound mixer Kmix works only on the main channel.
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 5423bb297..40d6a53b4 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dlfcn.h,v 1.16 2022/08/20 17:39:22 tb Exp $	*/
+/*	$OpenBSD: dlfcn.h,v 1.17 2024/09/01 04:27:45 guenther Exp $	*/
 /*	$NetBSD: dlfcn.h,v 1.2 1995/06/05 19:38:00 pk Exp $	*/
 
 /*
@@ -52,17 +52,24 @@
 #define	RTLD_DEFAULT	((void *) -2)	/* Use default search algorithm. */
 #define	RTLD_SELF	((void *) -3)	/* Search the caller itself. */
 
-#if __BSD_VISIBLE
-
+#if __BSD_VISIBLE || __POSIX_VISIBLE >= 202405
 /*
  * Structure filled in by dladdr().
  */
-typedef	struct dl_info {
+typedef	struct
+#if __BSD_VISIBLE
+	dl_info
+#endif
+{
 	const char	*dli_fname;	/* Pathname of shared object. */
 	void		*dli_fbase;	/* Base address of shared object. */
 	const char	*dli_sname;	/* Name of nearest symbol. */
 	void		*dli_saddr;	/* Address of nearest symbol. */
-} Dl_info;
+} Dl_info_t;
+#endif /* __BSD_VISIBLE || __POSIX_VISIBLE >= 202405 */
+
+#if __BSD_VISIBLE
+typedef Dl_info_t Dl_info;
 
 /*
  * dlctl() commands
@@ -90,8 +97,11 @@ int	dlclose(void *);
 void	*dlsym(void *__restrict, const char *__restrict);
 char	*dlerror(void);
 
+#if __BSD_VISIBLE || __POSIX_VISIBLE >= 202405
+int	dladdr(const void *__restrict, Dl_info_t *__restrict);
+#endif
+
 #if __BSD_VISIBLE
-int	dladdr(const void *, Dl_info *);
 int	dlctl(void *, int, void *);
 #endif /* __BSD_VISIBLE */
 
diff --git a/regress/lib/libcrypto/symbols/symbols.awk b/regress/lib/libcrypto/symbols/symbols.awk
index c9a726600..8ea68b681 100644
--- a/regress/lib/libcrypto/symbols/symbols.awk
+++ b/regress/lib/libcrypto/symbols/symbols.awk
@@ -1,4 +1,4 @@
-# $OpenBSD: symbols.awk,v 1.12 2024/07/10 13:11:22 tb Exp $
+# $OpenBSD: symbols.awk,v 1.13 2024/09/01 17:20:37 tb Exp $
 
 # Copyright (c) 2018,2020 Theo Buehler <tb@openbsd.org>
 #
@@ -20,13 +20,6 @@ BEGIN {
 	printf("#include \"include_headers.c\"\n\n")
 }
 
-# These are machdep.
-/^OPENSSL_cpuid_setup$/						||
-/^OPENSSL_cpu_caps$/ {
-	printf("/* skipped %s */\n", $0)
-	next
-}
-
 {
 	symbols[$0] = $0
 
diff --git a/regress/sys/kern/unveil/Makefile b/regress/sys/kern/unveil/Makefile
index 7eee884d1..8637a0541 100644
--- a/regress/sys/kern/unveil/Makefile
+++ b/regress/sys/kern/unveil/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2024/08/31 20:03:03 jeremy Exp $
+#	$OpenBSD: Makefile,v 1.7 2024/09/01 05:48:20 anton Exp $
 
 WARNINGS=	yes
 
@@ -10,6 +10,9 @@ run-regress-syscalls:
 	${SUDO} ./syscalls
 
 PROGS+=				socket
-PROGS+=				access
+
+PROGS+=access
+run-regress-access: access
+	./access ${.CURDIR}/access-expected
 
 .include <bsd.regress.mk>
diff --git a/regress/sys/kern/unveil/access.c b/regress/sys/kern/unveil/access.c
index 24dbfaa6c..e2729a54e 100644
--- a/regress/sys/kern/unveil/access.c
+++ b/regress/sys/kern/unveil/access.c
@@ -23,14 +23,20 @@ const char* filenames[] = {"f", "fr", "fw", "fx", "fc", "frw", "frx", "frc",
 			   "frwc", "frxc", "fwxc", "frwxc"};
 const char* header = "unveil:access\n";
 
-int main(int argc, char** argv) {
+int
+main(int argc, char *argv[])
+{
 	int i;
 	int log_fd;
 	FILE *log;
-	char expected[PATH_MAX];
-	char *exp;
+	const char *expected;
+
+	if (argc != 2) {
+		fprintf(stderr, "usage: access expected-path\n");
+		exit(1);
+	}
+	expected = argv[1];
 
-	UV_SHOULD_SUCCEED(((exp = realpath("access-expected", expected)) == NULL), "realpath");
 	UV_SHOULD_SUCCEED(((log_fd = mkstemp(uv_file)) == -1), "mkstemp");
 	UV_SHOULD_SUCCEED(((log = fdopen(log_fd, "w")) == NULL), "fdopen");
 	UV_SHOULD_SUCCEED((mkdtemp(uv_dir) == NULL), "mkdtmp");
diff --git a/regress/sys/sys/tree/Makefile b/regress/sys/sys/tree/Makefile
index b1300d58e..60cb7263b 100644
--- a/regress/sys/sys/tree/Makefile
+++ b/regress/sys/sys/tree/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.3 2002/08/21 15:10:06 miod Exp $
+#	$OpenBSD: Makefile,v 1.4 2024/09/01 00:22:59 aisha Exp $
 
-SUBDIR= splay rb
+SUBDIR= splay rb rb-linux
 
 install:
 
diff --git a/regress/sys/sys/tree/rb-linux/Makefile b/regress/sys/sys/tree/rb-linux/Makefile
new file mode 100644
index 000000000..d7231d872
--- /dev/null
+++ b/regress/sys/sys/tree/rb-linux/Makefile
@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.2 2024/09/01 06:05:11 anton Exp $
+
+CFLAGS=	-I${BSDSRCDIR}/sys/dev/pci/drm/include
+PROGS=	rb-linux
+WARNINGS=yes
+
+.include <bsd.regress.mk>
diff --git a/regress/sys/sys/tree/rb-linux/rb-linux.c b/regress/sys/sys/tree/rb-linux/rb-linux.c
new file mode 100644
index 000000000..ce07f1ca8
--- /dev/null
+++ b/regress/sys/sys/tree/rb-linux/rb-linux.c
@@ -0,0 +1,155 @@
+/*	$OpenBSD: rb-linux.c,v 1.2 2024/09/01 06:05:11 anton Exp $	*/
+/*
+ * Copyright 2002 Niels Provos <provos@citi.umich.edu>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <err.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include <linux/rbtree.h>
+#include <linux/container_of.h>
+
+struct keynode {
+	struct rb_node node;
+	int key;
+};
+
+struct rb_root root;
+
+static struct keynode *
+rb_find(struct rb_root *head, struct keynode *elm)
+{
+	struct rb_node *tmp = head->rb_node;
+
+	while (tmp) {
+		struct keynode *n = container_of(tmp, struct keynode, node);
+		if (elm->key < n->key)
+			tmp = tmp->rb_left;
+		else if (elm->key > n->key)
+			tmp = tmp->rb_right;
+		else
+			return n;
+	}
+	return NULL;
+}
+
+static struct keynode *
+rb_insert(struct rb_root *head, struct keynode *elm)
+{
+	struct rb_node **tmp;
+	struct rb_node *parent = NULL;
+	tmp = &(head->rb_node);
+
+	while (*tmp) {
+		struct keynode *n = container_of(*tmp, struct keynode, node);
+		parent = *tmp;
+		if (elm->key < n->key)
+			tmp = &((*tmp)->rb_left);
+		else if (elm->key > n->key)
+			tmp = &((*tmp)->rb_right);
+		else
+			return n;
+	}
+
+	rb_link_node(&elm->node, parent, tmp);
+	rb_insert_color(&elm->node, head);
+
+	return NULL;
+}
+
+#define TESTS 10
+#define ITER 150
+#define MIN 5
+#define MAX 5000
+
+int
+main(int argc, char **argv)
+{
+	struct keynode *tmp, *ins;
+	int i, t, max, min;
+	struct rb_node *rb_node;
+
+	root = RB_ROOT;
+
+	for (t = 0; t < 10; t++) {
+		for (i = 0; i < ITER; i++) {
+			tmp = malloc(sizeof(struct keynode));
+			if (tmp == NULL)
+				err(1, "malloc");
+			do {
+				tmp->key = arc4random_uniform(MAX - MIN);
+				tmp->key += MIN;
+			} while (rb_find(&root, tmp) != NULL);
+			if (i == 0)
+				max = min = tmp->key;
+			else {
+				if (tmp->key > max)
+					max = tmp->key;
+				if (tmp->key < min)
+					min = tmp->key;
+			}
+			if (rb_insert(&root, tmp) != NULL)
+				errx(1, "rb_insert failed");
+		}
+
+		rb_node = rb_first(&root);
+		ins = container_of(rb_node, struct keynode, node);
+		if (ins->key != min)
+			errx(1, "min does not match");
+		tmp = ins;
+		rb_node = rb_last(&root);
+		ins = container_of(rb_node, struct keynode, node);
+		if (ins->key != max)
+			errx(1, "max does not match");
+
+		rb_erase(&tmp->node, &root);
+
+		for (i = 0; i < ITER - 1; i++) {
+			rb_node = rb_first(&root);
+			if (rb_node == NULL)
+				errx(1, "rb_first error");
+			tmp = container_of(rb_node, struct keynode, node);
+			rb_erase(&tmp->node, &root);
+			free(tmp);
+		}
+	}
+
+	exit(0);
+}
+
+#undef RB_ROOT
+#define RB_ROOT(head)	(head)->rbh_root
+
+RB_GENERATE(linux_root, rb_node, __entry, panic_cmp);
+
+int
+panic_cmp(struct rb_node *a, struct rb_node *b)
+{
+	errx(1, "%s", __func__);
+}
diff --git a/sbin/dhcpleased/control.c b/sbin/dhcpleased/control.c
index b6043f580..87bd77578 100644
--- a/sbin/dhcpleased/control.c
+++ b/sbin/dhcpleased/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.5 2024/08/25 09:53:53 florian Exp $	*/
+/*	$OpenBSD: control.c,v 1.6 2024/09/01 20:24:42 tb Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -291,7 +291,7 @@ control_dispatch_imsg(int fd, short event, void *bula)
 
 			c->iev.ibuf.pid = pid;
 			frontend_imsg_compose_engine(IMSG_REQUEST_REBOOT, 0,
-			    pid, &if_index, sizeof(&if_index));
+			    pid, &if_index, sizeof(if_index));
 			break;
 		default:
 			log_debug("%s: error handling imsg %d", __func__, type);
diff --git a/share/man/man3/dlfcn.3 b/share/man/man3/dlfcn.3
index b8395976a..fb24e044e 100644
--- a/share/man/man3/dlfcn.3
+++ b/share/man/man3/dlfcn.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dlfcn.3,v 1.35 2023/08/26 01:38:28 deraadt Exp $
+.\"	$OpenBSD: dlfcn.3,v 1.36 2024/09/01 04:27:45 guenther Exp $
 .\"	$NetBSD: dlfcn.3,v 1.3 1996/01/09 19:43:34 pk Exp $
 .\"
 .\" Copyright (c) 1995 Paul Kranenburg
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 26 2023 $
+.Dd $Mdocdate: September 1 2024 $
 .Dt DLOPEN 3
 .Os
 .Sh NAME
@@ -301,6 +301,16 @@ being returned.
 .Xr ld 1 ,
 .Xr ld.so 1 ,
 .Xr elf 5
+.Sh STANDARDS
+The
+.Fn dladdr ,
+.Fn dlclose ,
+.Fn dlerror ,
+.Fn dlopen ,
+and
+.Fn dlsym
+functions conform to
+.St -p1003.1-2024 .
 .Sh HISTORY
 Some of the
 .Nm dl*
diff --git a/share/man/man4/bktr.4 b/share/man/man4/bktr.4
index 72ed85fad..3ab98bf01 100644
--- a/share/man/man4/bktr.4
+++ b/share/man/man4/bktr.4
@@ -29,10 +29,10 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: bktr.4,v 1.29 2015/09/14 17:09:26 schwarze Exp $
+.\" $OpenBSD: bktr.4,v 1.30 2024/09/01 05:33:29 jsg Exp $
 .\" $FreeBSD: /c/ncvs/src/share/man/man4/bktr.4,v 1.9.2.5 2001/03/06 19:08:09 ru Exp $
 .\"
-.Dd $Mdocdate: September 14 2015 $
+.Dd $Mdocdate: September 1 2024 $
 .Dt BKTR 4
 .Os
 .Sh NAME
@@ -445,9 +445,9 @@ Philips FM1216
 .It PHILIPS_FR1236_SECAM
 Philips FM1216MF
 .It ALPS_TSCH5
-Apls TSCH5 NTSC
+Alps TSCH5 NTSC
 .It ALPS_TSBH1
-Apls TSBH1 NTSC
+Alps TSBH1 NTSC
 .It TIVISION_TVF5533
 Tivision TVF5533-MF NTSC
 .El
diff --git a/share/man/man4/ccp.4 b/share/man/man4/ccp.4
index 942312f8b..eb957767c 100644
--- a/share/man/man4/ccp.4
+++ b/share/man/man4/ccp.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ccp.4,v 1.4 2019/04/23 20:23:36 jmc Exp $
+.\"     $OpenBSD: ccp.4,v 1.5 2024/09/01 19:32:48 bluhm Exp $
 .\"
 .\" Copyright (c) 2018 David Gwynne <dlg@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 23 2019 $
+.Dd $Mdocdate: September 1 2024 $
 .Dt CCP 4
 .Os
 .Sh NAME
@@ -33,6 +33,12 @@ The
 .Nm
 driver supports feeding output of the random number generator into
 the kernel entropy pool.
+.Pp
+On amd64
+.Nm
+provides
+.Xr ioctl 2
+access to the platform security processor (PSP).
 .Sh SEE ALSO
 .Xr intro 4 ,
 .Xr random 4 ,
@@ -48,3 +54,5 @@ The
 .Nm
 driver was written by
 .An David Gwynne Aq Mt dlg@openbsd.org .
+PSP support was implemented by
+.An Hans-Joerg Hoexer Aq Mt hshoexer@genua.de .
diff --git a/share/man/man4/sec.4 b/share/man/man4/sec.4
index 60632ee06..d0ebbbd85 100644
--- a/share/man/man4/sec.4
+++ b/share/man/man4/sec.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sec.4,v 1.4 2024/08/31 00:51:29 dlg Exp $
+.\" $OpenBSD: sec.4,v 1.5 2024/09/01 05:20:25 jsg Exp $
 .\"
 .\" Copyright (c) 2023 David Gwynne <dlg@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 31 2024 $
+.Dd $Mdocdate: September 1 2024 $
 .Dt SEC 4
 .Os
 .Sh NAME
@@ -116,7 +116,7 @@ Alternatively, IKEv1 negotiation of the IPsec tunnel SAs is supported by
 .Xr isakmpd 8
 and
 .Xr ipsecctl 8 .
-The equivalient
+The equivalent
 .Xr ipsec.conf 5
 configuration for the given parameters follows:
 .Bd -literal -offset indent
diff --git a/sys/arch/amd64/amd64/acpi_machdep.c b/sys/arch/amd64/amd64/acpi_machdep.c
index e7371833a..8342d5f27 100644
--- a/sys/arch/amd64/amd64/acpi_machdep.c
+++ b/sys/arch/amd64/amd64/acpi_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpi_machdep.c,v 1.110 2024/05/29 12:21:33 kettenis Exp $	*/
+/*	$OpenBSD: acpi_machdep.c,v 1.111 2024/09/01 03:08:56 jsg Exp $	*/
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  *
@@ -455,7 +455,7 @@ acpi_sleep_cpu(struct acpi_softc *sc, int state)
 /*
  * First repair the interrupt hardware so that any events which occur
  * will cause the least number of unexpected side effects.  We re-start
- * the clocks early because we will soon run AML whigh might do DELAY.
+ * the clocks early because we will soon run AML which might do DELAY.
  * Then PM, and then further system/CPU work for the BSP cpu.
  */
 void
diff --git a/sys/arch/amd64/include/conf.h b/sys/arch/amd64/include/conf.h
index 5a2b10fe4..730a5b2c2 100644
--- a/sys/arch/amd64/include/conf.h
+++ b/sys/arch/amd64/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.9 2022/06/28 14:43:50 visa Exp $	*/
+/*	$OpenBSD: conf.h,v 1.10 2024/09/01 17:13:46 bluhm Exp $	*/
 /*	$NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $	*/
 
 /*
@@ -54,3 +54,6 @@ cdev_decl(pctr);
 
 #include "vmm.h"
 cdev_decl(vmm);
+
+#include "ccp.h"
+cdev_decl(psp);
diff --git a/sys/arch/amd64/stand/libsa/pxe.h b/sys/arch/amd64/stand/libsa/pxe.h
index ffb777c7b..09893aa6d 100644
--- a/sys/arch/amd64/stand/libsa/pxe.h
+++ b/sys/arch/amd64/stand/libsa/pxe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxe.h,v 1.7 2016/06/10 18:36:06 jcs Exp $ */
+/*	$OpenBSD: pxe.h,v 1.8 2024/09/01 03:08:56 jsg Exp $ */
 /*	$NetBSD: pxe.h,v 1.1 2002/02/16 03:37:40 thorpej Exp $	*/
 
 /*
@@ -282,7 +282,7 @@ typedef struct {
 #define	PXENV_UNDI_GET_MCAST_ADDRESS	0x0011
 typedef struct {
 	PXENV_STATUS_t	Status;
-	IP4_t		InetAddr;		/* IP mulicast address */
+	IP4_t		InetAddr;		/* IP multicast address */
 	MAC_ADDR	MediaAddr;		/* MAC multicast address */
 } __packed t_PXENV_UNDI_GET_MCAST_ADDR;
 
diff --git a/sys/arch/i386/i386/acpi_machdep.c b/sys/arch/i386/i386/acpi_machdep.c
index ffd9e8092..647b2892b 100644
--- a/sys/arch/i386/i386/acpi_machdep.c
+++ b/sys/arch/i386/i386/acpi_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpi_machdep.c,v 1.87 2023/01/30 10:49:04 jsg Exp $	*/
+/*	$OpenBSD: acpi_machdep.c,v 1.88 2024/09/01 03:08:56 jsg Exp $	*/
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  *
@@ -402,7 +402,7 @@ acpi_sleep_cpu(struct acpi_softc *sc, int state)
 /*
  * First repair the interrupt hardware so that any events which occur
  * will cause the least number of unexpected side effects.  We re-start
- * the clocks early because we will soon run AML whigh might do DELAY.
+ * the clocks early because we will soon run AML which might do DELAY.
  * Then PM, and then further system/CPU work for the BSP cpu.
  */
 void
diff --git a/sys/arch/i386/stand/libsa/pxe.h b/sys/arch/i386/stand/libsa/pxe.h
index ffb777c7b..09893aa6d 100644
--- a/sys/arch/i386/stand/libsa/pxe.h
+++ b/sys/arch/i386/stand/libsa/pxe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxe.h,v 1.7 2016/06/10 18:36:06 jcs Exp $ */
+/*	$OpenBSD: pxe.h,v 1.8 2024/09/01 03:08:56 jsg Exp $ */
 /*	$NetBSD: pxe.h,v 1.1 2002/02/16 03:37:40 thorpej Exp $	*/
 
 /*
@@ -282,7 +282,7 @@ typedef struct {
 #define	PXENV_UNDI_GET_MCAST_ADDRESS	0x0011
 typedef struct {
 	PXENV_STATUS_t	Status;
-	IP4_t		InetAddr;		/* IP mulicast address */
+	IP4_t		InetAddr;		/* IP multicast address */
 	MAC_ADDR	MediaAddr;		/* MAC multicast address */
 } __packed t_PXENV_UNDI_GET_MCAST_ADDR;
 
diff --git a/sys/dev/fdt/dwpcie.c b/sys/dev/fdt/dwpcie.c
index 169b530fd..f1d5e3e6b 100644
--- a/sys/dev/fdt/dwpcie.c
+++ b/sys/dev/fdt/dwpcie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwpcie.c,v 1.56 2024/07/09 08:47:10 kettenis Exp $	*/
+/*	$OpenBSD: dwpcie.c,v 1.57 2024/09/01 03:08:56 jsg Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -739,9 +739,9 @@ dwpcie_attach_deferred(struct device *self)
 		pba.pba_flags |= PCI_FLAGS_MSI_ENABLED;
 
 	/*
-	 * Only support mutiple MSI vectors if we have enough MSI
+	 * Only support multiple MSI vectors if we have enough MSI
 	 * interrupts (or are using an external interrupt controller
-	 * that hopefully suppors plenty of MSI interripts).
+	 * that hopefully supports plenty of MSI interrupts).
 	 */
 	if (OF_getproplen(sc->sc_node, "msi-map") > 0 ||
 	    sc->sc_num_msi > 32)
diff --git a/sys/dev/fdt/imxehci.c b/sys/dev/fdt/imxehci.c
index effa9f9a5..1bc34406d 100644
--- a/sys/dev/fdt/imxehci.c
+++ b/sys/dev/fdt/imxehci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: imxehci.c,v 1.6 2022/04/06 18:59:28 naddy Exp $ */
+/*	$OpenBSD: imxehci.c,v 1.7 2024/09/01 03:08:56 jsg Exp $ */
 /*
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -361,7 +361,7 @@ imx23_usb_init(struct imxehci_softc *sc, uint32_t *cells)
 	    anatop, sizeof(anatop)) == sizeof(anatop))
 		rm = regmap_byphandle(anatop[0]);
 
-	/* Disable the carger detection, else signal on DP will be poor */
+	/* Disable the charger detection, else signal on DP will be poor */
 	switch (sc->sc_unit) {
 	case 0:
 		if (rm != NULL)
diff --git a/sys/dev/fdt/qcpas.c b/sys/dev/fdt/qcpas.c
index 05a9fdec5..5d0589778 100644
--- a/sys/dev/fdt/qcpas.c
+++ b/sys/dev/fdt/qcpas.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qcpas.c,v 1.6 2024/08/05 18:36:28 kettenis Exp $	*/
+/*	$OpenBSD: qcpas.c,v 1.7 2024/09/01 03:14:48 jsg Exp $	*/
 /*
  * Copyright (c) 2023 Patrick Wildt <patrick@blueri.se>
  *
@@ -1223,7 +1223,7 @@ struct battmgr_bat_info {
 	uint32_t max_sample_time_ms;
 	uint32_t min_sample_time_ms;
 	uint32_t max_average_interval_ms;
-	uint32_t min_averae_interval_ms;
+	uint32_t min_average_interval_ms;
 	uint32_t capacity_granularity1;
 	uint32_t capacity_granularity2;
 	uint32_t swappable;
diff --git a/sys/dev/hid/hidkbd.c b/sys/dev/hid/hidkbd.c
index cf1c03b65..d4a3c432b 100644
--- a/sys/dev/hid/hidkbd.c
+++ b/sys/dev/hid/hidkbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hidkbd.c,v 1.13 2024/07/02 05:50:02 gkoehler Exp $	*/
+/*	$OpenBSD: hidkbd.c,v 1.14 2024/09/01 03:08:56 jsg Exp $	*/
 /*      $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $        */
 
 /*
@@ -147,7 +147,7 @@ static const struct hidkbd_translation apple_fn_trans[] = {
 	{ 67, 235 },	/* F10 -> backlight raise */
 	{ 39, 84 },	/* keypad divide */
 	{ 19, 85 },	/* keypad multiply */
-	{ 51, 86 },	/* keypad substract */
+	{ 51, 86 },	/* keypad subtract */
 	{ 56, 87 },	/* keypad add */
 	{ 13, 89 },	/* keypad 1 */
 	{ 14, 90 },	/* keypad 2 */
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index fbbac2b07..4abaf52fa 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aac.c,v 1.96 2023/09/11 12:10:47 mvs Exp $	*/
+/*	$OpenBSD: aac.c,v 1.97 2024/09/01 03:08:56 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -2677,7 +2677,7 @@ aac_print_aif(struct aac_softc *sc, struct aac_aif_command *aif)
 			break;
 		case AifJobFsVerify:
 			/* File System Verify operation */
-			printf("\t(FsVerivy)\n");
+			printf("\t(FsVerify)\n");
 			break;
 		case AifJobFsExtend:
 			/* File System Extend operation */
diff --git a/sys/dev/ic/acx111.c b/sys/dev/ic/acx111.c
index 2826b4431..33b944864 100644
--- a/sys/dev/ic/acx111.c
+++ b/sys/dev/ic/acx111.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx111.c,v 1.24 2022/01/09 05:42:38 jsg Exp $ */
+/*	$OpenBSD: acx111.c,v 1.25 2024/09/01 03:08:56 jsg Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -80,7 +80,7 @@
 
 #define ACX111_INTR_ENABLE	(ACXRV_INTR_TX_FINI | ACXRV_INTR_RX_FINI)
 /*
- * XXX do we really care about fowlling interrupts?
+ * XXX do we really care about the following interrupts?
  *
  * ACXRV_INTR_IV_ICV_FAILURE | ACXRV_INTR_INFO |
  * ACXRV_INTR_SCAN_FINI | ACXRV_INTR_FCS_THRESHOLD
diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c
index c61152696..6ad091f3a 100644
--- a/sys/dev/ic/aic79xx.c
+++ b/sys/dev/ic/aic79xx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic79xx.c,v 1.67 2022/01/09 05:42:38 jsg Exp $	*/
+/*	$OpenBSD: aic79xx.c,v 1.68 2024/09/01 03:08:56 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -2060,7 +2060,7 @@ ahd_handle_pkt_busfree(struct ahd_softc *ahd, u_int busfreetime)
 		 * SCB that encountered the failure.  Clean
 		 * up the queue, clear SELDO and LQOBUSFREE,
 		 * and allow the sequencer to restart the select
-		 * out at its lesure.
+		 * out at its leisure.
 		 */
 		ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
 		scbid = ahd_inw(ahd, CURRSCB);
diff --git a/sys/dev/ic/aic79xx.h b/sys/dev/ic/aic79xx.h
index 291aef605..250ac9f15 100644
--- a/sys/dev/ic/aic79xx.h
+++ b/sys/dev/ic/aic79xx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic79xx.h,v 1.31 2024/05/29 00:48:15 jsg Exp $	*/
+/*	$OpenBSD: aic79xx.h,v 1.32 2024/09/01 03:08:56 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -409,7 +409,7 @@ typedef enum {
  */
 
 /*
- * Status information embedded in the shared poriton of
+ * Status information embedded in the shared portion of
  * an SCB after passing the cdb to the target.  The kernel
  * driver will only read this data for transactions that
  * complete abnormally.
diff --git a/sys/dev/ic/aic7xxx_seeprom.c b/sys/dev/ic/aic7xxx_seeprom.c
index 832f98b40..aac6460f1 100644
--- a/sys/dev/ic/aic7xxx_seeprom.c
+++ b/sys/dev/ic/aic7xxx_seeprom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic7xxx_seeprom.c,v 1.9 2021/03/07 06:21:38 jsg Exp $	*/
+/*	$OpenBSD: aic7xxx_seeprom.c,v 1.10 2024/09/01 03:08:56 jsg Exp $	*/
 /*	$NetBSD: aic7xxx_seeprom.c,v 1.8 2003/05/02 19:12:19 dyoung Exp $	*/
 
 /*
@@ -47,7 +47,7 @@
  * from the FreeBSD source file aic7xxx_pci.c by Frank van der Linden
  * <fvdl@netbsd.org>
  *
- * $Id: aic7xxx_seeprom.c,v 1.9 2021/03/07 06:21:38 jsg Exp $
+ * $Id: aic7xxx_seeprom.c,v 1.10 2024/09/01 03:08:56 jsg Exp $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.22 2003/01/20 20:44:55 gibbs Exp $
  */
@@ -88,7 +88,7 @@ static void ahc_parse_pci_eeprom(struct ahc_softc *, struct seeprom_config *);
 
 /*
  * Check the external port logic for a serial eeprom
- * and termination/cable detection contrls.
+ * and termination/cable detection controls.
  */
 void
 ahc_check_extport(struct ahc_softc *ahc, u_int *sxfrctl1)
diff --git a/sys/dev/ic/am79900reg.h b/sys/dev/ic/am79900reg.h
index 947159aac..4ec7a9c31 100644
--- a/sys/dev/ic/am79900reg.h
+++ b/sys/dev/ic/am79900reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: am79900reg.h,v 1.2 2008/06/26 05:42:15 ray Exp $	*/
+/*	$OpenBSD: am79900reg.h,v 1.3 2024/09/01 03:08:56 jsg Exp $	*/
 /*	$NetBSD: am79900reg.h,v 1.7 2005/02/27 00:27:00 perry Exp $	*/
 
 /*-
@@ -131,7 +131,7 @@ struct leinit {
 /* Transmit message descriptor 3 (tmd3) */
 #define	LE_T2_BUFF	(1<<31)		/* buffer error */
 #define	LE_T2_UFLO	(1<<30)		/* underflow error */
-#define	LE_T2_EXDEF	(1<<29)		/* excessive defferral */
+#define	LE_T2_EXDEF	(1<<29)		/* excessive deferral */
 #define	LE_T2_LCOL	(1<<28)		/* late collision */
 #define	LE_T2_LCAR	(1<<27)		/* loss of carrier */
 #define	LE_T2_RTRY	(1<<26)		/* retry error */
diff --git a/sys/dev/ic/bt485.c b/sys/dev/ic/bt485.c
index df157dc11..7d27a884b 100644
--- a/sys/dev/ic/bt485.c
+++ b/sys/dev/ic/bt485.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bt485.c,v 1.14 2014/07/08 17:19:25 deraadt Exp $ */
+/* $OpenBSD: bt485.c,v 1.15 2024/09/01 03:08:56 jsg Exp $ */
 /* $NetBSD: bt485.c,v 1.2 2000/04/02 18:55:01 nathanw Exp $ */
 
 /*
@@ -210,7 +210,7 @@ bt485_init(rc)
 	regval |= 0x02;
 	data->ramdac_wr(data->cookie, BT485_REG_COMMAND_0, regval);
 
-	/* Set the RAMDAC to 8BPP (no interestion options). */
+	/* Set the RAMDAC to 8BPP (no interesting options). */
 	data->ramdac_wr(data->cookie, BT485_REG_COMMAND_1, 0x40);
 
 	/* Disable the cursor (for now) */
diff --git a/sys/dev/ic/ccp.c b/sys/dev/ic/ccp.c
index 5981ae434..42ae5f8e7 100644
--- a/sys/dev/ic/ccp.c
+++ b/sys/dev/ic/ccp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccp.c,v 1.6 2024/08/13 20:48:00 bluhm Exp $ */
+/*	$OpenBSD: ccp.c,v 1.9 2024/09/01 19:25:06 bluhm Exp $ */
 
 /*
  * Copyright (c) 2018 David Gwynne <dlg@openbsd.org>
@@ -24,6 +24,7 @@
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/timeout.h>
+#include <sys/pledge.h>
 
 #include <machine/bus.h>
 
@@ -129,7 +130,7 @@ psp_attach(struct ccp_softc *sc)
 
 	/*
          * create and map Trusted Memory Region (TMR); size 1 Mbyte,
-         * needs to be aligend to 1 Mbyte.
+         * needs to be aligned to 1 Mbyte.
 	 */
 	sc->sc_tmr_size = size = PSP_TMR_SIZE;
 	if (bus_dmamap_create(sc->sc_dmat, size, 1, size, 0,
@@ -563,6 +564,29 @@ psp_deactivate(struct psp_deactivate *udeact)
 	return (0);
 }
 
+int
+psp_guest_shutdown(struct psp_guest_shutdown *ugshutdown)
+{
+	struct psp_deactivate	deact;
+	struct psp_decommission	decom;
+	int			ret;
+
+	bzero(&deact, sizeof(deact));
+	deact.handle = ugshutdown->handle;
+	if ((ret = psp_deactivate(&deact)) != 0)
+		return (ret);
+
+	if ((ret = psp_df_flush()) != 0)
+		return (ret);
+
+	bzero(&decom, sizeof(decom));
+	decom.handle = ugshutdown->handle;
+	if ((ret = psp_decommission(&decom)) != 0)
+		return (ret);
+
+	return (0);
+}
+
 int
 psp_snp_get_pstatus(struct psp_snp_platform_status *ustatus)
 {
@@ -641,17 +665,39 @@ pspioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	case PSP_IOC_DEACTIVATE:
 		ret = psp_deactivate((struct psp_deactivate *)data);
 		break;
+	case PSP_IOC_GUEST_SHUTDOWN:
+		ret = psp_guest_shutdown((struct psp_guest_shutdown *)data);
+		break;
 	case PSP_IOC_SNP_GET_PSTATUS:
 		ret =
 		    psp_snp_get_pstatus((struct psp_snp_platform_status *)data);
 		break;
 	default:
-		printf("%s: unkown ioctl code 0x%lx\n", __func__, cmd);
 		ret = ENOTTY;
+		break;
 	}
 
 	rw_exit_write(&ccp_softc->sc_lock);
 
 	return (ret);
 }
+
+int
+pledge_ioctl_psp(struct proc *p, long com)
+{
+	switch (com) {
+	case PSP_IOC_GET_PSTATUS:
+	case PSP_IOC_DF_FLUSH:
+	case PSP_IOC_GET_GSTATUS:
+	case PSP_IOC_LAUNCH_START:
+	case PSP_IOC_LAUNCH_UPDATE_DATA:
+	case PSP_IOC_LAUNCH_MEASURE:
+	case PSP_IOC_LAUNCH_FINISH:
+	case PSP_IOC_ACTIVATE:
+	case PSP_IOC_GUEST_SHUTDOWN:
+		return (0);
+	default:
+		return (pledge_fail(p, EPERM, PLEDGE_VMM));
+	}
+}
 #endif	/* __amd64__ */
diff --git a/sys/dev/ic/ccpvar.h b/sys/dev/ic/ccpvar.h
index 65efe8479..7add1e0a4 100644
--- a/sys/dev/ic/ccpvar.h
+++ b/sys/dev/ic/ccpvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccpvar.h,v 1.3 2024/06/13 17:59:08 bluhm Exp $ */
+/*	$OpenBSD: ccpvar.h,v 1.4 2024/09/01 19:25:06 bluhm Exp $ */
 
 /*
  * Copyright (c) 2018 David Gwynne <dlg@openbsd.org>
@@ -243,6 +243,11 @@ struct psp_init {
 } __packed;
 
 
+struct psp_guest_shutdown {
+	/* Input parameter for PSP_CMD_GUEST_SHUTDOWN */
+	uint32_t		handle;
+} __packed;
+
 /* Selection of PSP commands of the SEV-SNP ABI Version 1.55 */
 
 #define PSP_CMD_SNP_PLATFORMSTATUS	0x81
@@ -272,6 +277,7 @@ struct psp_snp_platform_status {
 #define PSP_IOC_ACTIVATE	_IOW('P', 9, struct psp_activate)
 #define PSP_IOC_DEACTIVATE	_IOW('P', 10, struct psp_deactivate)
 #define PSP_IOC_SNP_GET_PSTATUS	_IOR('P', 11, struct psp_snp_platform_status)
+#define PSP_IOC_GUEST_SHUTDOWN	_IOW('P', 255, struct psp_guest_shutdown)
 #endif	/* __amd64__ */
 
 #ifdef _KERNEL
diff --git a/sys/dev/ic/cyreg.h b/sys/dev/ic/cyreg.h
index c09b06a4c..5176ae0ed 100644
--- a/sys/dev/ic/cyreg.h
+++ b/sys/dev/ic/cyreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cyreg.h,v 1.8 2002/09/14 15:00:02 art Exp $	*/
+/*	$OpenBSD: cyreg.h,v 1.9 2024/09/01 03:08:56 jsg Exp $	*/
 /*	$FreeBSD: cyreg.h,v 1.1 1995/07/05 12:15:51 bde Exp $	*/
 
 /*-
@@ -45,7 +45,7 @@
 #define	CY8_SVCACKT		0x200
 #define	CY8_SVCACKM		0x300
 
-/* twice this in PCI mode (shifed BUSTYPE bits left) */
+/* twice this in PCI mode (shifted BUSTYPE bits left) */
 #define	CY_CD1400_MEMSPACING	0x400
 
 /* adjustment value for accessing the last 4 cd1400s on Cyclom-32 */
diff --git a/sys/dev/ic/gdtvar.h b/sys/dev/ic/gdtvar.h
index 2a7e7c778..4e6ccfb77 100644
--- a/sys/dev/ic/gdtvar.h
+++ b/sys/dev/ic/gdtvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdtvar.h,v 1.26 2021/08/30 14:44:39 jasper Exp $	*/
+/*	$OpenBSD: gdtvar.h,v 1.27 2024/09/01 03:08:56 jsg Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Niklas Hallqvist.  All rights reserved.
@@ -66,7 +66,7 @@ struct gdt_intr_ctx {
 };
 
 /*
- * A command contol block, one for each corresponding command index of the
+ * A command control block, one for each corresponding command index of the
  * controller.
  */
 struct gdt_ccb {
diff --git a/sys/dev/ic/ics2101reg.h b/sys/dev/ic/ics2101reg.h
index 7ccc3b3a7..d2adf6d4f 100644
--- a/sys/dev/ic/ics2101reg.h
+++ b/sys/dev/ic/ics2101reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ics2101reg.h,v 1.3 2008/06/26 05:42:15 ray Exp $ */
+/* $OpenBSD: ics2101reg.h,v 1.4 2024/09/01 03:08:56 jsg Exp $ */
 /* $NetBSD: ics2101reg.h,v 1.3 1996/02/05 02:18:52 jtc Exp $ */
 
 /*-
@@ -61,7 +61,7 @@
 #define ICSMIX_CTRL_LEFT	0x00		/* Control left channel */
 #define ICSMIX_CTRL_RIGHT	0x01		/* Control right channel */
 #define ICSMIX_ATTN_LEFT	0x02		/* Attenuate left channel */
-#define ICSMIX_ATTN_RIGHT	0x03		/* Attenutate right channel */
+#define ICSMIX_ATTN_RIGHT	0x03		/* Attenuate right channel */
 #define ICSMIX_PAEN		0x04		/* Panning control */
 #define ICSMIX_CHAN_0		0		/* Values for mixer channels */
 #define ICSMIX_CHAN_1		1
diff --git a/sys/dev/ic/mtd8xxreg.h b/sys/dev/ic/mtd8xxreg.h
index f1a18f399..efd462583 100644
--- a/sys/dev/ic/mtd8xxreg.h
+++ b/sys/dev/ic/mtd8xxreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtd8xxreg.h,v 1.2 2003/10/21 18:58:49 jmc Exp $	*/
+/*	$OpenBSD: mtd8xxreg.h,v 1.3 2024/09/01 03:08:56 jsg Exp $	*/
 
 /*
  * Copyright (c) 2003 Oleg Safiullin <form@pdp11.org.ru>
@@ -92,7 +92,7 @@
 #define TCR_BACKOPT	0x10000000U	/* Optional back-off */
 #define TCR_FBACK	0x08000000U	/* Fast back-off */
 #define TCR_ENHANCED	0x02000000U	/* Enhanced transmit mode */
-#define TCR_TFCEN	0x01000000U	/* Ttansmit flow control enable */
+#define TCR_TFCEN	0x01000000U	/* Transmit flow control enable */
 #define TCR_TFT64	0x00000000U	/*   64 bytes */
 #define TCR_TFT32	0x00200000U	/*   32 bytes */
 #define TCR_TFT128	0x00400000U	/*  128 bytes */
@@ -144,7 +144,7 @@
 #define ISR_ROVF	0x00000200U	/* Receive overflow */
 #define ISR_ETI		0x00000100U	/* Early transfer interrupt */
 #define ISR_ERI		0x00000080U	/* Early receive interrupt */
-#define ISR_CNTOVF	0x00000040U	/* CRC or MPA tally ounter overflow */
+#define ISR_CNTOVF	0x00000040U	/* CRC or MPA tally counter overflow */
 #define ISR_RBU		0x00000020U	/* Receive buffer unavailable */
 #define ISR_TBU		0x00000010U	/* Transmit buffer unavailable */
 #define ISR_TI		0x00000008U	/* Transmit interrupt */
@@ -167,7 +167,7 @@
 #define IMR_MROVF	0x00000200U	/* Receive overflow */
 #define IMR_METI	0x00000100U	/* Early transfer interrupt */
 #define IMR_MERI	0x00000080U	/* Early receive interrupt */
-#define IMR_MCNTOVF	0x00000040U	/* CRC or MPA tally ounter overflow */
+#define IMR_MCNTOVF	0x00000040U	/* CRC or MPA tally counter overflow */
 #define IMR_MRBU	0x00000020U	/* Receive buffer unavailable */
 #define IMR_MTBU	0x00000010U	/* Transmit buffer unavailable */
 #define IMR_MTI		0x00000008U	/* Transmit interrupt */
diff --git a/sys/dev/ic/nvme.c b/sys/dev/ic/nvme.c
index a37f0f745..7e74d2931 100644
--- a/sys/dev/ic/nvme.c
+++ b/sys/dev/ic/nvme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nvme.c,v 1.121 2024/07/13 08:59:41 dv Exp $ */
+/*	$OpenBSD: nvme.c,v 1.122 2024/09/01 03:08:56 jsg Exp $ */
 
 /*
  * Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
@@ -1946,7 +1946,7 @@ nvme_bioctl_inq(struct nvme_softc *sc, struct bioc_inq *bi)
 	nvme_bio_status(bs, "Max i/o %zu bytes%s%s%s, Sanitize 0x%b",
 	    sc->sc_mdts,
 	    ISSET(idctrl->lpa, NVM_ID_CTRL_LPA_PE) ?
-	    ", Persisent Event Log" : "",
+	    ", Persistent Event Log" : "",
 	    ISSET(idctrl->fna, NVM_ID_CTRL_FNA_CRYPTOFORMAT) ?
 	    ", CryptoFormat" : "",
 	    ISSET(idctrl->vwc, NVM_ID_CTRL_VWC_PRESENT) ?
diff --git a/sys/dev/ic/qwx.c b/sys/dev/ic/qwx.c
index 369d5cace..67fea2964 100644
--- a/sys/dev/ic/qwx.c
+++ b/sys/dev/ic/qwx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qwx.c,v 1.66 2024/08/19 08:22:30 jsg Exp $	*/
+/*	$OpenBSD: qwx.c,v 1.67 2024/09/01 03:08:56 jsg Exp $	*/
 
 /*
  * Copyright 2023 Stefan Sperling <stsp@openbsd.org>
@@ -6691,7 +6691,7 @@ qwx_qmi_decode_msg(struct qwx_softc *sc, void *output, size_t output_len,
 
 			/* Related EIs must have the same type. */
 			if (ei->tlv_type != elem_type) {
-				printf("%s: unexepected element type 0x%x; "
+				printf("%s: unexpected element type 0x%x; "
 				    "expected 0x%x\n", __func__,
 				    ei->tlv_type, elem_type);
 				return -1;
@@ -7471,7 +7471,7 @@ qwx_qrtr_recv_msg(struct qwx_softc *sc, struct mbuf *m)
 		qwx_qrtr_resume_tx(sc);
 }
 
-// Not needed because we don't implenent QMI as a network service.
+// Not needed because we don't implement QMI as a network service.
 #define qwx_qmi_init_service(sc)	(0)
 #define qwx_qmi_deinit_service(sc)	(0)
 
@@ -14261,7 +14261,7 @@ qwx_dp_htt_htc_tx_complete(struct qwx_softc *sc, struct mbuf *m)
 static inline void
 qwx_dp_get_mac_addr(uint32_t addr_l32, uint16_t addr_h16, uint8_t *addr)
 {
-#if 0 /* Not needed on OpenBSD? We do swapping in sofware... */
+#if 0 /* Not needed on OpenBSD? We do swapping in software... */
 	if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) {
 		addr_l32 = swab32(addr_l32);
 		addr_h16 = swab16(addr_h16);
@@ -20790,7 +20790,7 @@ qwx_hal_srng_setup(struct qwx_softc *sc, enum hal_ring_type type,
 	memset(srng->ring_base_vaddr, 0,
 	    (srng->entry_size * srng->num_entries) << 2);
 
-#if 0 /* Not needed on OpenBSD? We do swapping in sofware... */
+#if 0 /* Not needed on OpenBSD? We do swapping in software... */
 	/* TODO: Add comments on these swap configurations */
 	if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))
 		srng->flags |= HAL_SRNG_FLAGS_MSI_SWAP | HAL_SRNG_FLAGS_DATA_TLV_SWAP |
@@ -22252,7 +22252,7 @@ qwx_reg_update_chan_list(struct qwx_softc *sc, uint8_t pdev_id)
 		    ch->antennamax, ch->phy_mode);
 
 		ch++;
-		/* TODO: use quarrter/half rate, cfreq12, dfs_cfreq2
+		/* TODO: use quarter/half rate, cfreq12, dfs_cfreq2
 		 * set_agile, reg_class_idx
 		 */
 	}
diff --git a/sys/dev/ic/qwxreg.h b/sys/dev/ic/qwxreg.h
index b746ad888..e1ddb8407 100644
--- a/sys/dev/ic/qwxreg.h
+++ b/sys/dev/ic/qwxreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qwxreg.h,v 1.7 2024/02/21 14:40:50 kevlo Exp $	*/
+/*	$OpenBSD: qwxreg.h,v 1.8 2024/09/01 03:08:56 jsg Exp $	*/
 
 /*
  * Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc.
@@ -163,7 +163,7 @@ struct wmi_tlv {
  *                        to be communicated separately.
  * @WMI_HOST_HW_MODE_DBS_SBS: 3 PHYs, with 2 on the same band doing SBS
  *                           as in WMI_HW_MODE_SBS, and 3rd on the other band
- * @WMI_HOST_HW_MODE_DBS_OR_SBS: Two PHY with one PHY capabale of both 2G and
+ * @WMI_HOST_HW_MODE_DBS_OR_SBS: Two PHY with one PHY capable of both 2G and
  *                        5G. It can support SBS (5G + 5G) OR DBS (5G + 2G).
  * @WMI_HOST_HW_MODE_MAX: Max hw_mode_id. Used to indicate invalid mode.
  */
@@ -2233,9 +2233,9 @@ enum {
 #define WMI_VDEV_SLOT_TIME_LONG         0x1
 /* slot time short */
 #define WMI_VDEV_SLOT_TIME_SHORT        0x2
-/* preablbe long */
+/* preamble long */
 #define WMI_VDEV_PREAMBLE_LONG          0x1
-/* preablbe short */
+/* preamble short */
 #define WMI_VDEV_PREAMBLE_SHORT         0x2
 
 enum wmi_peer_smps_state {
@@ -4224,7 +4224,7 @@ enum wmi_vdev_start_resp_status_code {
 	WMI_VDEV_START_RESPONSE_INVALID_REGDOMAIN = 4,
 };
 
-/* Regaulatory Rule Flags Passed by FW */
+/* Regulatory Rule Flags Passed by FW */
 #define REGULATORY_CHAN_DISABLED     BIT(0)
 #define REGULATORY_CHAN_NO_IR        BIT(1)
 #define REGULATORY_CHAN_RADAR        BIT(3)
@@ -8273,7 +8273,7 @@ struct hal_reo_cmd_hdr {
 #define HAL_REO_CMD_FLG_UNBLK_RESOURCE		BIT(7)
 #define HAL_REO_CMD_FLG_UNBLK_CACHE		BIT(8)
 
-/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO0_UPD_* feilds */
+/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO0_UPD_* fields */
 #define HAL_REO_CMD_UPD0_RX_QUEUE_NUM		BIT(8)
 #define HAL_REO_CMD_UPD0_VLD			BIT(9)
 #define HAL_REO_CMD_UPD0_ALDC			BIT(10)
@@ -8298,7 +8298,7 @@ struct hal_reo_cmd_hdr {
 #define HAL_REO_CMD_UPD0_PN_VALID		BIT(29)
 #define HAL_REO_CMD_UPD0_PN			BIT(30)
 
-/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO1_* feilds */
+/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO1_* fields */
 #define HAL_REO_CMD_UPD1_VLD			BIT(16)
 #define HAL_REO_CMD_UPD1_ALDC			GENMASK(18, 17)
 #define HAL_REO_CMD_UPD1_DIS_DUP_DETECTION	BIT(19)
@@ -8314,7 +8314,7 @@ struct hal_reo_cmd_hdr {
 #define HAL_REO_CMD_UPD1_PN_HANDLE_ENABLE	BIT(30)
 #define HAL_REO_CMD_UPD1_IGNORE_AMPDU_FLG	BIT(31)
 
-/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO2_* feilds */
+/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO2_* fields */
 #define HAL_REO_CMD_UPD2_SVLD			BIT(10)
 #define HAL_REO_CMD_UPD2_SSN			GENMASK(22, 11)
 #define HAL_REO_CMD_UPD2_SEQ_2K_ERR		BIT(23)
@@ -10677,7 +10677,7 @@ struct rx_attention {
  * msdu_limit_error
  *		Indicates that the MSDU threshold was exceeded and thus
  *		all the rest of the MSDUs will not be scattered and will not
- *		be decasulated but will be DMA'ed in RAW format as a single
+ *		be decapsulated but will be DMA'ed in RAW format as a single
  *		MSDU buffer.
  *
  * da_is_valid
diff --git a/sys/dev/ic/qwz.c b/sys/dev/ic/qwz.c
index 061019ef6..c9014cc0a 100644
--- a/sys/dev/ic/qwz.c
+++ b/sys/dev/ic/qwz.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qwz.c,v 1.7 2024/08/20 21:24:15 patrick Exp $	*/
+/*	$OpenBSD: qwz.c,v 1.9 2024/09/01 03:14:48 jsg Exp $	*/
 
 /*
  * Copyright 2023 Stefan Sperling <stsp@openbsd.org>
@@ -3530,7 +3530,7 @@ static const struct qmi_elem_info qmi_wlanfw_host_cap_req_msg_v01_ei[] = {
 		.array_type	= NO_ARRAY,
 		.tlv_type	= 0x1D,
 		.offset		= offsetof(struct qmi_wlanfw_host_cap_req_msg_v01,
-					   cal_duraiton),
+					   cal_duration),
 	},
 	{
 		.data_type	= QMI_OPT_FLAG,
@@ -5589,7 +5589,7 @@ qwz_qmi_decode_msg(struct qwz_softc *sc, void *output, size_t output_len,
 
 			/* Related EIs must have the same type. */
 			if (ei->tlv_type != elem_type) {
-				printf("%s: unexepected element type 0x%x; "
+				printf("%s: unexpected element type 0x%x; "
 				    "expected 0x%x\n", __func__,
 				    ei->tlv_type, elem_type);
 				return -1;
@@ -6423,7 +6423,7 @@ qwz_qrtr_recv_msg(struct qwz_softc *sc, struct mbuf *m)
 		qwz_qrtr_resume_tx(sc);
 }
 
-// Not needed because we don't implenent QMI as a network service.
+// Not needed because we don't implement QMI as a network service.
 #define qwz_qmi_init_service(sc)	(0)
 #define qwz_qmi_deinit_service(sc)	(0)
 
@@ -13495,7 +13495,7 @@ qwz_dp_htt_htc_tx_complete(struct qwz_softc *sc, struct mbuf *m)
 static inline void
 qwz_dp_get_mac_addr(uint32_t addr_l32, uint16_t addr_h16, uint8_t *addr)
 {
-#if 0 /* Not needed on OpenBSD? We do swapping in sofware... */
+#if 0 /* Not needed on OpenBSD? We do swapping in software... */
 	if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) {
 		addr_l32 = swab32(addr_l32);
 		addr_h16 = swab16(addr_h16);
@@ -20034,7 +20034,7 @@ qwz_hal_srng_setup(struct qwz_softc *sc, enum hal_ring_type type,
 	memset(srng->ring_base_vaddr, 0,
 	    (srng->entry_size * srng->num_entries) << 2);
 
-#if 0 /* Not needed on OpenBSD? We do swapping in sofware... */
+#if 0 /* Not needed on OpenBSD? We do swapping in software... */
 	/* TODO: Add comments on these swap configurations */
 	if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))
 		srng->flags |= HAL_SRNG_FLAGS_MSI_SWAP | HAL_SRNG_FLAGS_DATA_TLV_SWAP |
@@ -21466,7 +21466,7 @@ qwz_reg_update_chan_list(struct qwz_softc *sc, uint8_t pdev_id)
 		    ch->antennamax, ch->phy_mode);
 
 		ch++;
-		/* TODO: use quarrter/half rate, cfreq12, dfs_cfreq2
+		/* TODO: use quarter/half rate, cfreq12, dfs_cfreq2
 		 * set_agile, reg_class_idx
 		 */
 	}
diff --git a/sys/dev/ic/qwzreg.h b/sys/dev/ic/qwzreg.h
index 02050a404..81f604755 100644
--- a/sys/dev/ic/qwzreg.h
+++ b/sys/dev/ic/qwzreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qwzreg.h,v 1.4 2024/08/16 00:26:54 patrick Exp $	*/
+/*	$OpenBSD: qwzreg.h,v 1.6 2024/09/01 03:14:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc.
@@ -159,7 +159,7 @@ struct wmi_tlv {
  *                        to be communicated separately.
  * @WMI_HOST_HW_MODE_DBS_SBS: 3 PHYs, with 2 on the same band doing SBS
  *                           as in WMI_HW_MODE_SBS, and 3rd on the other band
- * @WMI_HOST_HW_MODE_DBS_OR_SBS: Two PHY with one PHY capabale of both 2G and
+ * @WMI_HOST_HW_MODE_DBS_OR_SBS: Two PHY with one PHY capable of both 2G and
  *                        5G. It can support SBS (5G + 5G) OR DBS (5G + 2G).
  * @WMI_HOST_HW_MODE_MAX: Max hw_mode_id. Used to indicate invalid mode.
  */
@@ -2229,9 +2229,9 @@ enum {
 #define WMI_VDEV_SLOT_TIME_LONG         0x1
 /* slot time short */
 #define WMI_VDEV_SLOT_TIME_SHORT        0x2
-/* preablbe long */
+/* preamble long */
 #define WMI_VDEV_PREAMBLE_LONG          0x1
-/* preablbe short */
+/* preamble short */
 #define WMI_VDEV_PREAMBLE_SHORT         0x2
 
 enum wmi_peer_smps_state {
@@ -4220,7 +4220,7 @@ enum wmi_vdev_start_resp_status_code {
 	WMI_VDEV_START_RESPONSE_INVALID_REGDOMAIN = 4,
 };
 
-/* Regaulatory Rule Flags Passed by FW */
+/* Regulatory Rule Flags Passed by FW */
 #define REGULATORY_CHAN_DISABLED     BIT(0)
 #define REGULATORY_CHAN_NO_IR        BIT(1)
 #define REGULATORY_CHAN_RADAR        BIT(3)
@@ -6626,7 +6626,7 @@ struct qmi_wlanfw_host_cap_req_msg_v01 {
 	uint8_t mem_cfg_mode_valid;
 	uint8_t mem_cfg_mode;
 	uint8_t cal_duration_valid;
-	uint16_t cal_duraiton;
+	uint16_t cal_duration;
 	uint8_t platform_name_valid;
 	char platform_name[QMI_WLANFW_MAX_PLATFORM_NAME_LEN_V01 + 1];
 	uint8_t ddr_range_valid;
@@ -8481,7 +8481,7 @@ struct ath12k_hal_reo_dest_ring {
  *		and the MPDU was processed in the following way:
  *		- NO re-order function is needed.
  *		- MPDU delinking is determined by the setting of Entrance
- *		  ring field: SW_excection_mpdu_delink
+ *		  ring field: SW_exception_mpdu_delink
  *		- Destination ring selection is based on the setting of
  *		  the Entrance ring field SW_exception_destination _ring_valid
  *
@@ -8633,7 +8633,7 @@ struct hal_reo_cmd_hdr {
 #define HAL_REO_CMD_FLG_UNBLK_RESOURCE		BIT(7)
 #define HAL_REO_CMD_FLG_UNBLK_CACHE		BIT(8)
 
-/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO0_UPD_* feilds */
+/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO0_UPD_* fields */
 #define HAL_REO_CMD_UPD0_RX_QUEUE_NUM		BIT(8)
 #define HAL_REO_CMD_UPD0_VLD			BIT(9)
 #define HAL_REO_CMD_UPD0_ALDC			BIT(10)
@@ -8658,7 +8658,7 @@ struct hal_reo_cmd_hdr {
 #define HAL_REO_CMD_UPD0_PN_VALID		BIT(29)
 #define HAL_REO_CMD_UPD0_PN			BIT(30)
 
-/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO1_* feilds */
+/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO1_* fields */
 #define HAL_REO_CMD_UPD1_VLD			BIT(16)
 #define HAL_REO_CMD_UPD1_ALDC			GENMASK(18, 17)
 #define HAL_REO_CMD_UPD1_DIS_DUP_DETECTION	BIT(19)
@@ -8674,7 +8674,7 @@ struct hal_reo_cmd_hdr {
 #define HAL_REO_CMD_UPD1_PN_HANDLE_ENABLE	BIT(30)
 #define HAL_REO_CMD_UPD1_IGNORE_AMPDU_FLG	BIT(31)
 
-/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO2_* feilds */
+/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO2_* fields */
 #define HAL_REO_CMD_UPD2_SVLD			BIT(10)
 #define HAL_REO_CMD_UPD2_SSN			GENMASK(22, 11)
 #define HAL_REO_CMD_UPD2_SEQ_2K_ERR		BIT(23)
@@ -11108,7 +11108,7 @@ struct rx_attention {
  * msdu_limit_error
  *		Indicates that the MSDU threshold was exceeded and thus
  *		all the rest of the MSDUs will not be scattered and will not
- *		be decasulated but will be DMA'ed in RAW format as a single
+ *		be decapsulated but will be DMA'ed in RAW format as a single
  *		MSDU buffer.
  *
  * da_is_valid
diff --git a/sys/dev/ic/r92creg.h b/sys/dev/ic/r92creg.h
index cd8b8dab4..8165b94d6 100644
--- a/sys/dev/ic/r92creg.h
+++ b/sys/dev/ic/r92creg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: r92creg.h,v 1.30 2023/04/28 01:24:14 kevlo Exp $	*/
+/*	$OpenBSD: r92creg.h,v 1.31 2024/09/01 03:14:48 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -1259,7 +1259,7 @@ struct r92c_rom {
 	uint8_t		rf_opt4;
 	uint8_t		reserved5;
 	uint8_t		version;
-	uint8_t		curstomer_id;
+	uint8_t		customer_id;
 } __packed;
 
 struct r92e_tx_pwr {
diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c
index 4a6a899a0..0006b4ec7 100644
--- a/sys/dev/ic/siop_common.c
+++ b/sys/dev/ic/siop_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siop_common.c,v 1.45 2024/04/13 23:44:11 jsg Exp $ */
+/*	$OpenBSD: siop_common.c,v 1.46 2024/09/01 03:08:56 jsg Exp $ */
 /*	$NetBSD: siop_common.c,v 1.37 2005/02/27 00:27:02 perry Exp $	*/
 
 /*
@@ -784,7 +784,7 @@ siop_sdp(struct siop_common_cmd *siop_cmd, int offset)
 
 	/*
 	 * First let see if we have a resid from a phase mismatch. If so,
-	 * we have to adjst the table at offset to remove transferred data.
+	 * we have to adjust the table at offset to remove transferred data.
 	 */
 	if (siop_cmd->flags & CMDFL_RESID) {
 		siop_cmd->flags &= ~CMDFL_RESID;
diff --git a/sys/dev/ic/w83l518d_sdmmc.c b/sys/dev/ic/w83l518d_sdmmc.c
index 35313fd5c..8801e0369 100644
--- a/sys/dev/ic/w83l518d_sdmmc.c
+++ b/sys/dev/ic/w83l518d_sdmmc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: w83l518d_sdmmc.c,v 1.5 2020/01/22 03:26:02 cheloha Exp $	*/
+/*	$OpenBSD: w83l518d_sdmmc.c,v 1.6 2024/09/01 03:08:56 jsg Exp $	*/
 /*	$NetBSD: w83l518d_sdmmc.c,v 1.1 2009/09/30 20:44:50 jmcneill Exp $ */
 
 /*
@@ -75,7 +75,7 @@ void	wb_sdmmc_card_intr_ack(sdmmc_chipset_handle_t);
 struct sdmmc_chip_functions wb_sdmmc_chip_functions = {
 	/* host controller reset */
 	wb_sdmmc_host_reset,
-	/* host controlle capabilities */
+	/* host controller capabilities */
 	wb_sdmmc_host_ocr,
 	wb_sdmmc_host_maxblklen,
 	/* card detection */
diff --git a/sys/dev/pci/ahd_pci.c b/sys/dev/pci/ahd_pci.c
index 171579a72..67a82bc8d 100644
--- a/sys/dev/pci/ahd_pci.c
+++ b/sys/dev/pci/ahd_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahd_pci.c,v 1.29 2022/10/21 17:45:40 kn Exp $	*/
+/*	$OpenBSD: ahd_pci.c,v 1.30 2024/09/01 03:08:56 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -649,7 +649,7 @@ fail:
 
 /*
  * Check the external port logic for a serial eeprom
- * and termination/cable detection contrls.
+ * and termination/cable detection controls.
  */
 int
 ahd_check_extport(struct ahd_softc *ahd)
diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c
index ad57ea888..f0735873a 100644
--- a/sys/dev/pci/cs4280.c
+++ b/sys/dev/pci/cs4280.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cs4280.c,v 1.62 2024/08/18 14:42:56 deraadt Exp $	*/
+/*	$OpenBSD: cs4280.c,v 1.63 2024/09/01 03:08:56 jsg Exp $	*/
 /*	$NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $	*/
 
 /*
@@ -470,7 +470,7 @@ cs4280_set_dac_rate(struct cs4280_softc *sc, int rate)
 	 * playback rate may range from 8000Hz to 48000Hz
 	 *
 	 * play_phase_increment = floor(rate*65536*1024/48000)
-	 * px = round(rate*65536*1024 - play_phase_incremnt*48000)
+	 * px = round(rate*65536*1024 - play_phase_increment*48000)
 	 * py=floor(px/200)
 	 * play_sample_rate_correction = px - 200*py
 	 *
diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c
index 24a0d4289..00eb83aa8 100644
--- a/sys/dev/pci/eap.c
+++ b/sys/dev/pci/eap.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: eap.c,v 1.65 2024/05/24 06:02:53 jsg Exp $ */
+/*      $OpenBSD: eap.c,v 1.66 2024/09/01 03:08:56 jsg Exp $ */
 /*	$NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */
 
 /*
@@ -521,7 +521,7 @@ eap_attach(struct device *parent, struct device *self, void *aux)
 		 * or it locks up.
 		 *
 		 * We don't know how to program it (no documentation),
-		 * and the linux/oss magic receipe doesn't work (breaks
+		 * and the linux/oss magic recipe doesn't work (breaks
 		 * full-duplex, by selecting different play and record
 		 * rates). On the other hand, the sample rate converter
 		 * can't be disabled (disabling it would disable DMA),
diff --git a/sys/dev/pci/gdt_pci.c b/sys/dev/pci/gdt_pci.c
index 5c4d645c0..8c23e344f 100644
--- a/sys/dev/pci/gdt_pci.c
+++ b/sys/dev/pci/gdt_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdt_pci.c,v 1.28 2024/05/24 06:02:53 jsg Exp $	*/
+/*	$OpenBSD: gdt_pci.c,v 1.29 2024/09/01 03:08:56 jsg Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Niklas Hallqvist.  All rights reserved.
@@ -493,7 +493,7 @@ gdt_pci_attach(struct device *parent, struct device *self, void *aux)
 			goto bail_out;
 		}
 
-		/* special commnd to controller BIOS */
+		/* special command to controller BIOS */
 		bus_space_write_4(dpmemt, dpmemh, GDT_MPR_IC + GDT_S_INFO, 0);
 		bus_space_write_4(dpmemt, dpmemh,
 		    GDT_MPR_IC + GDT_S_INFO + sizeof (u_int32_t), 0);
diff --git a/sys/dev/pci/if_bnxreg.h b/sys/dev/pci/if_bnxreg.h
index e09345caa..4467534ab 100644
--- a/sys/dev/pci/if_bnxreg.h
+++ b/sys/dev/pci/if_bnxreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bnxreg.h,v 1.50 2022/01/09 05:42:47 jsg Exp $	*/
+/*	$OpenBSD: if_bnxreg.h,v 1.51 2024/09/01 03:14:48 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2006 Broadcom Corporation
@@ -171,7 +171,7 @@
 /* Returns FALSE in "defects" per 2^31 - 1 calls, otherwise returns TRUE. */
 #define DB_RANDOMFALSE(defects)        (random() > defects)
 #define DB_OR_RANDOMFALSE(defects)  || (random() > defects)
-#define DB_AND_RANDOMFALSE(defects) && (random() > ddfects)
+#define DB_AND_RANDOMFALSE(defects) && (random() > defects)
 
 /* Returns TRUE in "defects" per 2^31 - 1 calls, otherwise returns FALSE. */
 #define DB_RANDOMTRUE(defects)         (random() < defects)
diff --git a/sys/dev/pci/if_bnxtreg.h b/sys/dev/pci/if_bnxtreg.h
index 01d126b3d..e9d616410 100644
--- a/sys/dev/pci/if_bnxtreg.h
+++ b/sys/dev/pci/if_bnxtreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bnxtreg.h,v 1.5 2022/01/28 07:11:14 guenther Exp $	*/
+/*	$OpenBSD: if_bnxtreg.h,v 1.6 2024/09/01 03:08:56 jsg Exp $	*/
 /*-
  *   BSD LICENSE
  *
@@ -8701,7 +8701,7 @@ struct hwrm_port_phy_cfg_input {
 	uint32_t tx_lpi_timer;
 	uint32_t unused_4;
 	/*
-	 * Reuested setting of TX LPI timer in microseconds. This field is valid
+	 * Requested setting of TX LPI timer in microseconds. This field is valid
 	 * only when EEE is enabled and TX LPI is enabled.
 	 */
 	#define HWRM_PORT_PHY_CFG_INPUT_TX_LPI_TIMER_MASK	UINT32_C(0xffffff)
@@ -23260,7 +23260,7 @@ struct hwrm_nvm_raw_write_blk_input {
 	 */
 	uint64_t host_src_addr;
 	/*
-	 * 64-bit Host Source Address. This is the loation of the source data to
+	 * 64-bit Host Source Address. This is the location of the source data to
 	 * be written.
 	 */
 	uint32_t dest_addr;
@@ -27747,7 +27747,7 @@ struct creq_destroy_cq_resp {
 	uint16_t cq_arm_lvl;
 	/*
 	 * CQ ARM Level: 0 ? Not Armed 1 ? Arm SE Only, Generate CNQE only for
-	 * incoming Solicted Events 2 ? Arm all, Generate CNQE for Rx and Tx
+	 * incoming Solicited Events 2 ? Arm all, Generate CNQE for Rx and Tx
 	 */
 	#define CREQ_DESTROY_CQ_RESP_CQ_ARM_LVL_MASK		UINT32_C(0x3)
 	#define CREQ_DESTROY_CQ_RESP_CQ_ARM_LVL_SFT		0
diff --git a/sys/dev/pci/if_em_hw.h b/sys/dev/pci/if_em_hw.h
index 623e3feab..2370bf1bb 100644
--- a/sys/dev/pci/if_em_hw.h
+++ b/sys/dev/pci/if_em_hw.h
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/* $OpenBSD: if_em_hw.h,v 1.95 2024/06/09 05:18:12 jsg Exp $ */
+/* $OpenBSD: if_em_hw.h,v 1.96 2024/09/01 03:08:56 jsg Exp $ */
 /* $FreeBSD: if_em_hw.h,v 1.15 2005/05/26 23:32:02 tackerman Exp $ */
 
 /* if_em_hw.h
@@ -2436,7 +2436,7 @@ struct em_host_command_info {
 #define EEPROM_WRITE_OPCODE_MICROWIRE 0x5  /* EEPROM write opcode */
 #define EEPROM_ERASE_OPCODE_MICROWIRE 0x7  /* EEPROM erase opcode */
 #define EEPROM_EWEN_OPCODE_MICROWIRE  0x13 /* EEPROM erase/write enable */
-#define EEPROM_EWDS_OPCODE_MICROWIRE  0x10 /* EEPROM erast/write disable */
+#define EEPROM_EWDS_OPCODE_MICROWIRE  0x10 /* EEPROM erase/write disable */
 
 /* EEPROM Commands - SPI */
 #define EEPROM_MAX_RETRY_SPI        5000 /* Max wait of 5ms, for RDY signal */
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c
index bc5b0a531..d4638039e 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.416 2024/05/24 06:02:53 jsg Exp $	*/
+/*	$OpenBSD: if_iwm.c,v 1.417 2024/09/01 03:08:59 jsg Exp $	*/
 
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -9238,7 +9238,7 @@ iwm_calib_timeout(void *arg)
 		ieee80211_amrr_choose(&sc->sc_amrr, &in->in_ni, &in->in_amn);
 		/*
 		 * If AMRR has chosen a new TX rate we must update
-		 * the firwmare's LQ rate table.
+		 * the firmware's LQ rate table.
 		 * ni_txrate may change again before the task runs so
 		 * cache the chosen rate in the iwm_node structure.
 		 */
diff --git a/sys/dev/pci/if_iwmreg.h b/sys/dev/pci/if_iwmreg.h
index 15d471e88..3fa21a520 100644
--- a/sys/dev/pci/if_iwmreg.h
+++ b/sys/dev/pci/if_iwmreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwmreg.h,v 1.69 2024/01/16 12:21:02 kevlo Exp $	*/
+/*	$OpenBSD: if_iwmreg.h,v 1.70 2024/09/01 03:08:59 jsg Exp $	*/
 
 /******************************************************************************
  *
@@ -1762,7 +1762,7 @@ static inline unsigned int IWM_FH_MEM_CBBC_QUEUE(unsigned int chnl)
 #define IWM_RX_LOW_WATERMARK 8
 
 /**
- * struct iwm_rb_status - reseve buffer status
+ * struct iwm_rb_status - reserve buffer status
  * 	host memory mapped FH registers
  * @closed_rb_num [0:11] - Indicates the index of the RB which was closed
  * @closed_fr_num [0:11] - Indicates the index of the RX Frame which was closed
diff --git a/sys/dev/pci/if_ngbereg.h b/sys/dev/pci/if_ngbereg.h
index 12105bd84..96673aaba 100644
--- a/sys/dev/pci/if_ngbereg.h
+++ b/sys/dev/pci/if_ngbereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ngbereg.h,v 1.1 2023/03/31 08:19:41 kevlo Exp $	*/
+/*	$OpenBSD: if_ngbereg.h,v 1.2 2024/09/01 03:08:59 jsg Exp $	*/
 
 /*
  * Copyright (c) 2015-2017 Beijing WangXun Technology Co., Ltd.
@@ -160,7 +160,7 @@
 #define NGBE_PSR_MAX_SZ			0x15020
 #define NGBE_PSR_VLAN_CTL		0x15088
 
-/* mcasst/ucast overflow tbl */
+/* mcast/ucast overflow tbl */
 #define NGBE_PSR_MC_TBL(_i)		(0x15200 + ((_i) * 4))
 #define NGBE_PSR_UC_TBL(_i)		(0x15400 + ((_i) * 4))
 
diff --git a/sys/dev/pci/if_skreg.h b/sys/dev/pci/if_skreg.h
index 5e7091ce5..c2741fa9a 100644
--- a/sys/dev/pci/if_skreg.h
+++ b/sys/dev/pci/if_skreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_skreg.h,v 1.64 2022/02/21 07:15:42 jsg Exp $	*/
+/*	$OpenBSD: if_skreg.h,v 1.65 2024/09/01 03:08:59 jsg Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -1761,16 +1761,16 @@ struct msk_status_desc {
 /* Source Address High #2 (SAH2) */
 #define YUKON_SAH2		0x0030	/* SA2[47:32] */
 
-/* Multicatst Address Hash Register 1 (MCAH1) */
+/* Multicast Address Hash Register 1 (MCAH1) */
 #define YUKON_MCAH1		0x0034
 
-/* Multicatst Address Hash Register 2 (MCAH2) */
+/* Multicast Address Hash Register 2 (MCAH2) */
 #define YUKON_MCAH2		0x0038
 
-/* Multicatst Address Hash Register 3 (MCAH3) */
+/* Multicast Address Hash Register 3 (MCAH3) */
 #define YUKON_MCAH3		0x003c
 
-/* Multicatst Address Hash Register 4 (MCAH4) */
+/* Multicast Address Hash Register 4 (MCAH4) */
 #define YUKON_MCAH4		0x0040
 
 /* Transmit Interrupt Register (TIR) */
diff --git a/sys/dev/pci/if_vmx.c b/sys/dev/pci/if_vmx.c
index c3ad040ce..a66d8a3c2 100644
--- a/sys/dev/pci/if_vmx.c
+++ b/sys/dev/pci/if_vmx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vmx.c,v 1.88 2024/06/17 11:13:43 bluhm Exp $	*/
+/*	$OpenBSD: if_vmx.c,v 1.89 2024/09/01 03:08:59 jsg Exp $	*/
 
 /*
  * Copyright (c) 2013 Tsubai Masanari
@@ -1135,7 +1135,7 @@ vmxnet3_rxintr(struct vmxnet3_softc *sc, struct vmxnet3_rxqueue *rq)
 		done[rid]++;
 
 		/*
-		 * A receive descriptor of type 4 which is flaged as start of
+		 * A receive descriptor of type 4 which is flagged as start of
 		 * packet, contains the number of TCP segment of an LRO packet.
 		 */
 		if (letoh32((rxcd->rxc_word3 & VMXNET3_RXC_TYPE_M) >>
diff --git a/sys/dev/pci/igc_i225.c b/sys/dev/pci/igc_i225.c
index 521a10c62..932e4104b 100644
--- a/sys/dev/pci/igc_i225.c
+++ b/sys/dev/pci/igc_i225.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: igc_i225.c,v 1.4 2023/02/03 11:31:52 mbuhl Exp $	*/
+/*	$OpenBSD: igc_i225.c,v 1.5 2024/09/01 03:08:59 jsg Exp $	*/
 /*-
  * Copyright 2021 Intel Corp
  * Copyright 2021 Rubicon Communications, LLC (Netgate)
@@ -763,7 +763,7 @@ igc_write_erase_flash_command_i225(struct igc_hw *hw, uint32_t opcode,
 /* igc_update_flash_i225 - Commit EEPROM to the flash
  * if fw_valid_bit is set, FW is active. setting FLUPD bit in EEC
  * register makes the FW load the internal shadow RAM into the flash.
- * Otherwise, fw_valid_bit is 0. if FL_SECU.block_prtotected_sw = 0
+ * Otherwise, fw_valid_bit is 0. if FL_SECU.block_protected_sw = 0
  * then FW is not active so the SW is responsible shadow RAM dump.
  *
  * @hw: pointer to the HW structure
diff --git a/sys/dev/pci/ixgb_ee.c b/sys/dev/pci/ixgb_ee.c
index 4e085c4c8..f16f27935 100644
--- a/sys/dev/pci/ixgb_ee.c
+++ b/sys/dev/pci/ixgb_ee.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/* $OpenBSD: ixgb_ee.c,v 1.9 2024/05/24 06:02:57 jsg Exp $ */
+/* $OpenBSD: ixgb_ee.c,v 1.10 2024/09/01 03:08:59 jsg Exp $ */
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -219,7 +219,7 @@ ixgb_standby_eeprom(struct ixgb_hw *hw)
 
 	eecd_reg = IXGB_READ_REG(hw, EECD);
 
-	/* Deselct EEPROM */
+	/* Deselect EEPROM */
 	eecd_reg &= ~(IXGB_EECD_CS | IXGB_EECD_SK);
 	IXGB_WRITE_REG(hw, EECD, eecd_reg);
 	usec_delay(50);
diff --git a/sys/dev/pci/ixgbe_x550.c b/sys/dev/pci/ixgbe_x550.c
index 5e5da281e..b3e147557 100644
--- a/sys/dev/pci/ixgbe_x550.c
+++ b/sys/dev/pci/ixgbe_x550.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ixgbe_x550.c,v 1.9 2024/05/13 01:15:51 jsg Exp $	*/
+/*	$OpenBSD: ixgbe_x550.c,v 1.10 2024/09/01 03:09:00 jsg Exp $	*/
 
 /******************************************************************************
 
@@ -1764,12 +1764,12 @@ int32_t ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
 }
 
 /**
- * ixgbe_get_lasi_ext_t_x550em - Determime external Base T PHY interrupt cause
+ * ixgbe_get_lasi_ext_t_x550em - Determine external Base T PHY interrupt cause
  * @hw: pointer to hardware structure
  * @lsc: pointer to boolean flag which indicates whether external Base T
  *       PHY interrupt is lsc
  *
- * Determime if external Base T PHY interrupt cause is high temperature
+ * Determine if external Base T PHY interrupt cause is high temperature
  * failure alarm or link status change.
  *
  * Return IXGBE_ERR_OVERTEMP if interrupt is high temperature
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index f29f70b44..9e15de72d 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.2085 2024/08/20 12:17:48 jsg Exp $
+$OpenBSD: pcidevs,v 1.2087 2024/09/02 03:59:40 yasuoka Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -2295,7 +2295,7 @@ product ATI RV630_5		0x958f	RV630
 product ATI RADEON_HD3600	0x9590	Radeon HD 3600
 product ATI RADEON_HD3650_M	0x9591	Mobility Radeon HD 3650
 product ATI RADEON_HD3670_M	0x9593	Mobility Radeon HD 3670
-product ATI FIREGL_V5700_M	0x9595	Mobilty FireGL V5700
+product ATI FIREGL_V5700_M	0x9595	Mobility FireGL V5700
 product ATI RADEON_HD3650_AGP	0x9596	Radeon HD 3650 AGP
 product ATI RV635_1		0x9597	RV635
 product ATI RADEON_HD3650	0x9598	Radeon HD 3650
@@ -2833,7 +2833,7 @@ product CMI CMI8738B		0x0112	CMI8738B Audio
 product CMI HSP56		0x0211	HSP56 AMR
 product CMI CMI8788		0x8788	CMI8788 HD Audio
 
-/* CNet produts */
+/* CNet products */
 product CNET GIGACARD		0x434e	GigaCard
 
 /* Cogent Data Technologies products */
@@ -4099,6 +4099,7 @@ product INTEL 82580_SERDES	0x1510	82580
 product INTEL 82580_SGMII	0x1511	82580
 product INTEL 82524EF		0x1513	82524EF Thunderbolt
 product INTEL 82599_KX4_MEZZ	0x1514	82599
+product INTEL X540_VF		0x1515	X540 VF
 product INTEL 82580_COPPER_DUAL	0x1516	82580
 product INTEL 82599_KR		0x1517	82599
 product INTEL 82576_NS_SERDES	0x1518	82576NS
@@ -4113,6 +4114,8 @@ product INTEL 82580_QUAD_FIBER	0x1527	82580 QF
 product INTEL X540T		0x1528	X540T
 product INTEL 82599_SFP_FCOE	0x1529	82599
 product INTEL 82599_BPLANE_FCOE	0x152a	82599
+product INTEL 82599_VF_HV	0x152e	82599 VF HV
+product INTEL X540_VF_HV	0x1530	X540 VF HV
 product INTEL I210_COPPER	0x1533	I210
 product INTEL I210_COPPER_OEM1	0x1534	I210
 product INTEL I210_COPPER_IT	0x1535	I210
@@ -4133,6 +4136,8 @@ product INTEL I218_V		0x1559	I218-V
 product INTEL I218_LM		0x155a	I218-LM
 product INTEL X540T1		0x1560	X540T
 product INTEL X550T		0x1563	X550T
+product INTEL X550_VF_HV	0x1564	X550 VF HV
+product INTEL X550_VF		0x1565	X550 VF
 product INTEL DSL5520		0x156c	DSL5520 Thunderbolt
 product INTEL DSL5520_PCIE	0x156d	DSL5520 Thunderbolt
 product INTEL I219_LM		0x156f	I219-LM
@@ -4156,11 +4161,14 @@ product INTEL I218_LM_2		0x15a0	I218-LM
 product INTEL I218_V_2		0x15a1	I218-V
 product INTEL I218_LM_3		0x15a2	I218-LM
 product INTEL I218_V_3		0x15a3	I218-V
+product INTEL X550EM_X_VF	0x15a8	X552 VF
+product INTEL X550EM_X_VF_HV	0x15a9	X552 VF HV
 product INTEL X550EM_X_KX4	0x15aa	X552 Backplane
 product INTEL X550EM_X_KR	0x15ab	X552 Backplane
 product INTEL X550EM_X_SFP	0x15ac	X552 SFP+
 product INTEL X550EM_X_10G_T	0x15ad	X552/X557-AT
 product INTEL X550EM_X_1G_T	0x15ae	X552 1GbaseT
+product INTEL X550EM_A_VF_HV	0x15b4	X553 VF HV
 product INTEL I219_LM2		0x15b7	I219-LM
 product INTEL I219_V2		0x15b8	I219-V
 product INTEL I219_LM3		0x15b9	I219-LM
@@ -4174,6 +4182,7 @@ product INTEL JHL6240_XHCI	0x15c1	JHL6240 Thunderbolt 3
 product INTEL X550EM_A_KR	0x15c2	X553 Backplane
 product INTEL X550EM_A_KR_L	0x15c3	X553 Backplane
 product INTEL X550EM_A_SFP_N	0x15c4	X553 SFP+
+product INTEL X550EM_A_VF	0x15c5	X553 VF
 product INTEL X550EM_A_SGMII	0x15c6	X553 SGMII
 product INTEL X550EM_A_SGMII_L	0x15c7	X553 SGMII
 product INTEL X550EM_A_10G_T	0x15c8	X553 10GBaseT
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index f2b77c563..5ebba19ec 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.2085 2024/08/20 12:17:48 jsg Exp 
+ *	OpenBSD: pcidevs,v 1.2087 2024/09/02 03:59:40 yasuoka Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -2300,7 +2300,7 @@
 #define	PCI_PRODUCT_ATI_RADEON_HD3600	0x9590		/* Radeon HD 3600 */
 #define	PCI_PRODUCT_ATI_RADEON_HD3650_M	0x9591		/* Mobility Radeon HD 3650 */
 #define	PCI_PRODUCT_ATI_RADEON_HD3670_M	0x9593		/* Mobility Radeon HD 3670 */
-#define	PCI_PRODUCT_ATI_FIREGL_V5700_M	0x9595		/* Mobilty FireGL V5700 */
+#define	PCI_PRODUCT_ATI_FIREGL_V5700_M	0x9595		/* Mobility FireGL V5700 */
 #define	PCI_PRODUCT_ATI_RADEON_HD3650_AGP	0x9596		/* Radeon HD 3650 AGP */
 #define	PCI_PRODUCT_ATI_RV635_1	0x9597		/* RV635 */
 #define	PCI_PRODUCT_ATI_RADEON_HD3650	0x9598		/* Radeon HD 3650 */
@@ -2838,7 +2838,7 @@
 #define	PCI_PRODUCT_CMI_HSP56	0x0211		/* HSP56 AMR */
 #define	PCI_PRODUCT_CMI_CMI8788	0x8788		/* CMI8788 HD Audio */
 
-/* CNet produts */
+/* CNet products */
 #define	PCI_PRODUCT_CNET_GIGACARD	0x434e		/* GigaCard */
 
 /* Cogent Data Technologies products */
@@ -4104,6 +4104,7 @@
 #define	PCI_PRODUCT_INTEL_82580_SGMII	0x1511		/* 82580 */
 #define	PCI_PRODUCT_INTEL_82524EF	0x1513		/* 82524EF Thunderbolt */
 #define	PCI_PRODUCT_INTEL_82599_KX4_MEZZ	0x1514		/* 82599 */
+#define	PCI_PRODUCT_INTEL_X540_VF	0x1515		/* X540 VF */
 #define	PCI_PRODUCT_INTEL_82580_COPPER_DUAL	0x1516		/* 82580 */
 #define	PCI_PRODUCT_INTEL_82599_KR	0x1517		/* 82599 */
 #define	PCI_PRODUCT_INTEL_82576_NS_SERDES	0x1518		/* 82576NS */
@@ -4118,6 +4119,8 @@
 #define	PCI_PRODUCT_INTEL_X540T	0x1528		/* X540T */
 #define	PCI_PRODUCT_INTEL_82599_SFP_FCOE	0x1529		/* 82599 */
 #define	PCI_PRODUCT_INTEL_82599_BPLANE_FCOE	0x152a		/* 82599 */
+#define	PCI_PRODUCT_INTEL_82599_VF_HV	0x152e		/* 82599 VF HV */
+#define	PCI_PRODUCT_INTEL_X540_VF_HV	0x1530		/* X540 VF HV */
 #define	PCI_PRODUCT_INTEL_I210_COPPER	0x1533		/* I210 */
 #define	PCI_PRODUCT_INTEL_I210_COPPER_OEM1	0x1534		/* I210 */
 #define	PCI_PRODUCT_INTEL_I210_COPPER_IT	0x1535		/* I210 */
@@ -4138,6 +4141,8 @@
 #define	PCI_PRODUCT_INTEL_I218_LM	0x155a		/* I218-LM */
 #define	PCI_PRODUCT_INTEL_X540T1	0x1560		/* X540T */
 #define	PCI_PRODUCT_INTEL_X550T	0x1563		/* X550T */
+#define	PCI_PRODUCT_INTEL_X550_VF_HV	0x1564		/* X550 VF HV */
+#define	PCI_PRODUCT_INTEL_X550_VF	0x1565		/* X550 VF */
 #define	PCI_PRODUCT_INTEL_DSL5520	0x156c		/* DSL5520 Thunderbolt */
 #define	PCI_PRODUCT_INTEL_DSL5520_PCIE	0x156d		/* DSL5520 Thunderbolt */
 #define	PCI_PRODUCT_INTEL_I219_LM	0x156f		/* I219-LM */
@@ -4161,11 +4166,14 @@
 #define	PCI_PRODUCT_INTEL_I218_V_2	0x15a1		/* I218-V */
 #define	PCI_PRODUCT_INTEL_I218_LM_3	0x15a2		/* I218-LM */
 #define	PCI_PRODUCT_INTEL_I218_V_3	0x15a3		/* I218-V */
+#define	PCI_PRODUCT_INTEL_X550EM_X_VF	0x15a8		/* X552 VF */
+#define	PCI_PRODUCT_INTEL_X550EM_X_VF_HV	0x15a9		/* X552 VF HV */
 #define	PCI_PRODUCT_INTEL_X550EM_X_KX4	0x15aa		/* X552 Backplane */
 #define	PCI_PRODUCT_INTEL_X550EM_X_KR	0x15ab		/* X552 Backplane */
 #define	PCI_PRODUCT_INTEL_X550EM_X_SFP	0x15ac		/* X552 SFP+ */
 #define	PCI_PRODUCT_INTEL_X550EM_X_10G_T	0x15ad		/* X552/X557-AT */
 #define	PCI_PRODUCT_INTEL_X550EM_X_1G_T	0x15ae		/* X552 1GbaseT */
+#define	PCI_PRODUCT_INTEL_X550EM_A_VF_HV	0x15b4		/* X553 VF HV */
 #define	PCI_PRODUCT_INTEL_I219_LM2	0x15b7		/* I219-LM */
 #define	PCI_PRODUCT_INTEL_I219_V2	0x15b8		/* I219-V */
 #define	PCI_PRODUCT_INTEL_I219_LM3	0x15b9		/* I219-LM */
@@ -4179,6 +4187,7 @@
 #define	PCI_PRODUCT_INTEL_X550EM_A_KR	0x15c2		/* X553 Backplane */
 #define	PCI_PRODUCT_INTEL_X550EM_A_KR_L	0x15c3		/* X553 Backplane */
 #define	PCI_PRODUCT_INTEL_X550EM_A_SFP_N	0x15c4		/* X553 SFP+ */
+#define	PCI_PRODUCT_INTEL_X550EM_A_VF	0x15c5		/* X553 VF */
 #define	PCI_PRODUCT_INTEL_X550EM_A_SGMII	0x15c6		/* X553 SGMII */
 #define	PCI_PRODUCT_INTEL_X550EM_A_SGMII_L	0x15c7		/* X553 SGMII */
 #define	PCI_PRODUCT_INTEL_X550EM_A_10G_T	0x15c8		/* X553 10GBaseT */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 6d9cd875b..b11ef6fd6 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.2085 2024/08/20 12:17:48 jsg Exp 
+ *	OpenBSD: pcidevs,v 1.2087 2024/09/02 03:59:40 yasuoka Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -7309,7 +7309,7 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREGL_V5700_M,
-	    "Mobilty FireGL V5700",
+	    "Mobility FireGL V5700",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_HD3650_AGP,
@@ -13743,6 +13743,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82599_KX4_MEZZ,
 	    "82599",
 	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X540_VF,
+	    "X540 VF",
+	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_COPPER_DUAL,
 	    "82580",
@@ -13799,6 +13803,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82599_BPLANE_FCOE,
 	    "82599",
 	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82599_VF_HV,
+	    "82599 VF HV",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X540_VF_HV,
+	    "X540 VF HV",
+	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I210_COPPER,
 	    "I210",
@@ -13879,6 +13891,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550T,
 	    "X550T",
 	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550_VF_HV,
+	    "X550 VF HV",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550_VF,
+	    "X550 VF",
+	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DSL5520,
 	    "DSL5520 Thunderbolt",
@@ -13971,6 +13991,14 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_V_3,
 	    "I218-V",
 	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_X_VF,
+	    "X552 VF",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_X_VF_HV,
+	    "X552 VF HV",
+	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_X_KX4,
 	    "X552 Backplane",
@@ -13991,6 +14019,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_X_1G_T,
 	    "X552 1GbaseT",
 	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_A_VF_HV,
+	    "X553 VF HV",
+	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I219_LM2,
 	    "I219-LM",
@@ -14043,6 +14075,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_A_SFP_N,
 	    "X553 SFP+",
 	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_A_VF,
+	    "X553 VF",
+	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X550EM_A_SGMII,
 	    "X553 SGMII",
diff --git a/sys/dev/pci/pciide_pdc202xx_reg.h b/sys/dev/pci/pciide_pdc202xx_reg.h
index d8711cea4..fded28bed 100644
--- a/sys/dev/pci/pciide_pdc202xx_reg.h
+++ b/sys/dev/pci/pciide_pdc202xx_reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide_pdc202xx_reg.h,v 1.16 2022/01/09 05:42:58 jsg Exp $	*/
+/*	$OpenBSD: pciide_pdc202xx_reg.h,v 1.17 2024/09/01 03:09:00 jsg Exp $	*/
 /*	$NetBSD: pciide_pdc202xx_reg.h,v 1.5 2001/07/05 08:38:27 toshii Exp $ */
 
 /*
@@ -101,7 +101,7 @@
 #define PDC262_ATAPI_LBA48_WRITE 0x06000000
 
 /*
- * The timings provided here cmoes from the PDC20262 docs. I hope they are
+ * The timings provided here comes from the PDC20262 docs. I hope they are
  * right for the PDC20246 too ...
  */
 
diff --git a/sys/dev/usb/if_cuereg.h b/sys/dev/usb/if_cuereg.h
index ebb463ae2..151674d20 100644
--- a/sys/dev/usb/if_cuereg.h
+++ b/sys/dev/usb/if_cuereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cuereg.h,v 1.12 2013/04/15 09:23:01 mglocker Exp $ */
+/*	$OpenBSD: if_cuereg.h,v 1.13 2024/09/01 03:09:00 jsg Exp $ */
 /*	$NetBSD: if_cuereg.h,v 1.14 2001/01/21 22:09:24 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -76,7 +76,7 @@
 
 #define CUE_LEDCTL				0x81
 
-/* Advenced operating mode register */
+/* Advanced operating mode register */
 #define CUE_AOP_SRAMWAITS			0x03
 #define CUE_AOP_EMBED_RXLEN			0x08
 #define CUE_AOP_RXCOMBINE			0x10
diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c
index c9577ca21..197042cca 100644
--- a/sys/dev/usb/if_urtw.c
+++ b/sys/dev/usb/if_urtw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtw.c,v 1.73 2024/05/23 03:21:09 jsg Exp $	*/
+/*	$OpenBSD: if_urtw.c,v 1.74 2024/09/01 03:09:00 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
@@ -3498,7 +3498,7 @@ urtw_task(void *arg)
 
 fail:
 	if (error != 0)
-		DPRINTF(("%s: error duing processing RUN state.",
+		DPRINTF(("%s: error processing RUN state.",
 		    sc->sc_dev.dv_xname));
 }
 
diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c
index f6075bd9f..a579dffb3 100644
--- a/sys/dev/usb/if_urtwn.c
+++ b/sys/dev/usb/if_urtwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtwn.c,v 1.110 2024/05/23 03:21:09 jsg Exp $	*/
+/*	$OpenBSD: if_urtwn.c,v 1.111 2024/09/01 03:09:00 jsg Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -2494,7 +2494,7 @@ urtwn_burstlen_init(struct urtwn_softc *sc)
 		urtwn_write_1(sc, R92C_USTIME_TSF, 0x28);
 		urtwn_write_1(sc, R88F_USTIME_EDCA, 0x28);
 
-		/* To prevent mac is reseted by bus. */
+		/* To prevent bus resetting the mac. */
 		urtwn_write_1(sc, R92C_RSV_CTRL,
 		    urtwn_read_1(sc, R92C_RSV_CTRL) |
 		    R92C_RSV_CTRL_R_DIS_PRST_0 | R92C_RSV_CTRL_R_DIS_PRST_1);
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index 0c02b6110..e94548851 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uaudio.c,v 1.175 2024/07/23 08:59:21 ratchov Exp $	*/
+/*	$OpenBSD: uaudio.c,v 1.176 2024/09/01 03:09:00 jsg Exp $	*/
 /*
  * Copyright (c) 2018 Alexandre Ratchov <alex@caoua.org>
  *
@@ -1999,7 +1999,7 @@ uaudio_process_header(struct uaudio_softc *sc, struct uaudio_blob *p)
 /*
  * Process AC interrupt endpoint descriptor, this is mainly to skip
  * the descriptor as we use neither of its properties. Our mixer
- * interface doesn't support unsolicitated state changes, so we've no
+ * interface doesn't support unsolicited state changes, so we've no
  * use of it yet.
  */
 int
@@ -2313,7 +2313,7 @@ uaudio_process_ac(struct uaudio_softc *sc, struct uaudio_blob *p, int ifnum)
  *			to adapt to software's desired rate
  *
  *
- * For usb1.1 ival is cardcoded to 1 for isochronous
+ * For usb1.1 ival is hardcoded to 1 for isochronous
  * transfers, which means one transfer every ms. I.e one
  * transfer every frame period.
  *
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index c3b67b8ba..2071b961b 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvideo.c,v 1.221 2024/07/20 12:34:52 jsg Exp $ */
+/*	$OpenBSD: uvideo.c,v 1.222 2024/09/01 03:09:00 jsg Exp $ */
 
 /*
  * Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -3810,7 +3810,7 @@ uvideo_ucode_loader_ricoh(struct uvideo_softc *sc)
 
 /*
  * The iSight first generation device will first attach as
- * 0x8300 non-UVC.  After the firmware gots uploaded, the device
+ * 0x8300 non-UVC.  After the firmware is uploaded, the device
  * will reset and come back as 0x8501 UVC compatible.
  */
 usbd_status
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c
index 6ee112430..0a3d65ce1 100644
--- a/sys/kern/kern_pledge.c
+++ b/sys/kern/kern_pledge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_pledge.c,v 1.316 2024/06/03 03:41:47 deraadt Exp $	*/
+/*	$OpenBSD: kern_pledge.c,v 1.317 2024/09/01 17:13:46 bluhm Exp $	*/
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -76,6 +76,7 @@
 #if NVMM > 0
 #include <machine/conf.h>
 #endif
+#include "ccp.h"
 #endif
 
 #include "drm.h"
@@ -1349,6 +1350,18 @@ pledge_ioctl(struct proc *p, long com, struct file *fp)
 	}
 #endif
 
+#if defined(__amd64__) && NCCP > 0 && NVMM > 0
+	if ((pledge & PLEDGE_VMM)) {
+		if ((fp->f_type == DTYPE_VNODE) &&
+		    (vp->v_type == VCHR) &&
+		    (cdevsw[major(vp->v_rdev)].d_open == pspopen)) {
+			error = pledge_ioctl_psp(p, com);
+			if (error == 0)
+				return (0);
+		}
+	}
+#endif
+
 	return pledge_fail(p, error, PLEDGE_TTY);
 }
 
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 6e1eb2d0c..33dab14f7 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_syscalls.c,v 1.367 2024/08/31 15:52:09 deraadt Exp $	*/
+/*	$OpenBSD: vfs_syscalls.c,v 1.368 2024/09/01 23:26:10 deraadt Exp $	*/
 /*	$NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $	*/
 
 /*
@@ -2002,10 +2002,8 @@ dofaccessat(struct proc *p, int fd, const char *path, int amode, int flag)
 		vflags |= VWRITE;
 		nd.ni_unveil |= UNVEIL_WRITE;
 	}
-	if (amode & X_OK) {
+	if (amode & X_OK)
 		vflags |= VEXEC;
-		nd.ni_unveil |= UNVEIL_EXEC;
-	}
 	if ((error = namei(&nd)) != 0)
 		goto out;
 	vp = nd.ni_vp;
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 8f72c1c54..84a86d648 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bridge.c,v 1.371 2024/08/05 17:47:29 bluhm Exp $	*/
+/*	$OpenBSD: if_bridge.c,v 1.372 2024/09/01 03:09:00 jsg Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -262,7 +262,7 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 
 	/*
 	 * bridge(4) data structure aren't protected by the NET_LOCK().
-	 * Idealy it shouldn't be taken before calling `ifp->if_ioctl'
+	 * Ideally it shouldn't be taken before calling `ifp->if_ioctl'
 	 * but we aren't there yet.  Media ioctl run without netlock.
 	 */
 	switch (cmd) {
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 554083bb3..588bcc07a 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_output.c,v 1.139 2024/05/08 14:02:59 stsp Exp $	*/
+/*	$OpenBSD: ieee80211_output.c,v 1.140 2024/09/01 03:09:00 jsg Exp $	*/
 /*	$NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $	*/
 
 /*-
@@ -1817,7 +1817,7 @@ ieee80211_get_action(struct ieee80211com *ic, struct ieee80211_node *ni,
 /*
  * Send a management frame.  The node is for the destination (or ic_bss
  * when in station mode).  Nodes other than ic_bss have their reference
- * count bumped to reflect our use for an indeterminant time.
+ * count bumped to reflect our use for an indeterminate time.
  */
 int
 ieee80211_send_mgmt(struct ieee80211com *ic, struct ieee80211_node *ni,
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index bb8c3389a..41986fb89 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6.h,v 1.118 2024/05/13 01:15:53 jsg Exp $	*/
+/*	$OpenBSD: in6.h,v 1.119 2024/09/01 03:09:00 jsg Exp $	*/
 /*	$KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $	*/
 
 /*
@@ -576,7 +576,7 @@ ifatoia6(struct ifaddr *ifa)
 #define IPV6CTL_MRTPROTO	8	/* multicast routing protocol */
 #define IPV6CTL_MAXFRAGPACKETS	9	/* max packets reassembly queue */
 #define IPV6CTL_SOURCECHECK	10	/* verify source route and intf */
-#define IPV6CTL_SOURCECHECK_LOGINT 11	/* minimume logging interval */
+#define IPV6CTL_SOURCECHECK_LOGINT 11	/* minimum logging interval */
 #define IPV6CTL_ACCEPT_RTADV	12
 #define IPV6CTL_LOG_INTERVAL	14
 #define IPV6CTL_HDRNESTLIMIT	15
diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c
index 7fa5a9fde..f41a6e6c8 100644
--- a/sys/netinet6/ip6_id.c
+++ b/sys/netinet6/ip6_id.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_id.c,v 1.17 2024/02/13 12:22:09 bluhm Exp $	*/
+/*	$OpenBSD: ip6_id.c,v 1.18 2024/09/01 03:09:00 jsg Exp $	*/
 /*	$NetBSD: ip6_id.c,v 1.7 2003/09/13 21:32:59 itojun Exp $	*/
 /*	$KAME: ip6_id.c,v 1.8 2003/09/06 13:41:06 itojun Exp $	*/
 
@@ -76,7 +76,7 @@
  * The transaction id is determined by:
  * id[n] = seed xor (g^X[n] mod n)
  *
- * Effectivly the id is restricted to the lower (bits - 1) bits, thus
+ * Effectively the id is restricted to the lower (bits - 1) bits, thus
  * yielding two different cycles by toggling the msb on and off.
  * This avoids reuse issues caused by reseeding.
  */
diff --git a/sys/sys/pledge.h b/sys/sys/pledge.h
index 073ad9a05..7f6fbc927 100644
--- a/sys/sys/pledge.h
+++ b/sys/sys/pledge.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pledge.h,v 1.48 2023/06/02 17:44:29 cheloha Exp $	*/
+/*	$OpenBSD: pledge.h,v 1.49 2024/09/01 17:13:46 bluhm Exp $	*/
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -134,6 +134,7 @@ int	pledge_socket(struct proc *p, int domain, unsigned int state);
 int	pledge_ioctl(struct proc *p, long com, struct file *);
 int	pledge_ioctl_drm(struct proc *p, long com, dev_t device);
 int	pledge_ioctl_vmm(struct proc *p, long com);
+int	pledge_ioctl_psp(struct proc *p, long com);
 int	pledge_flock(struct proc *p);
 int	pledge_fcntl(struct proc *p, int cmd);
 int	pledge_swapctl(struct proc *p, int cmd);
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 3cae156eb..1312d33b5 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.370 2024/08/21 03:07:45 deraadt Exp $	*/
+/*	$OpenBSD: proc.h,v 1.371 2024/09/01 03:09:00 jsg Exp $	*/
 /*	$NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $	*/
 
 /*-
@@ -88,7 +88,7 @@ struct	pgrp {
 
 /*
  * time usage: accumulated times in ticks
- * Each thread is immediatly accumulated here. For processes only the
+ * Each thread is immediately accumulated here. For processes only the
  * time of exited threads is accumulated and to get the proper process
  * time usage tuagg_get_process() needs to be called.
  * Accounting of threads is done lockless by curproc using the tu_gen
diff --git a/sys/sys/syscall_mi.h b/sys/sys/syscall_mi.h
index c83ad99a3..d631bd53d 100644
--- a/sys/sys/syscall_mi.h
+++ b/sys/sys/syscall_mi.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscall_mi.h,v 1.34 2024/06/02 15:31:57 deraadt Exp $	*/
+/*	$OpenBSD: syscall_mi.h,v 1.35 2024/09/01 03:09:01 jsg Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -71,7 +71,7 @@ pin_check(struct proc *p, register_t code)
 	 * by most common case:
 	 * 1) dynamic binary: syscalls in libc.so (in the ps_libcpin region)
 	 * 2a) static binary: syscalls in main program (in the ps_pin region)
-	 * 2b) dynamic binary: sysalls in ld.so (in the ps_pin region)
+	 * 2b) dynamic binary: syscalls in ld.so (in the ps_pin region)
 	 * 3) sigtramp, containing only sigreturn(2)
 	 */
 	if (plibcpin->pn_pins &&
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index b8ca4563f..22609ddf4 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnode.h,v 1.173 2024/07/13 14:37:55 beck Exp $	*/
+/*	$OpenBSD: vnode.h,v 1.174 2024/09/01 03:09:01 jsg Exp $	*/
 /*	$NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $	*/
 
 /*
@@ -233,7 +233,7 @@ extern int		vttoif_tab[];
  * Flags to various vnode functions.
  */
 #define	SKIPSYSTEM	0x0001		/* vflush: skip vnodes marked VSYSTEM */
-#define	FORCECLOSE	0x0002		/* vflush: force file closeure */
+#define	FORCECLOSE	0x0002		/* vflush: force file closure */
 #define	WRITECLOSE	0x0004		/* vflush: only close writeable files */
 #define	DOCLOSE		0x0008		/* vclean: close active files */
 #define	IGNORECLEAN	0x0010		/* vflush: ignore clean vnodes */
diff --git a/usr.sbin/radiusctl/parser.c b/usr.sbin/radiusctl/parser.c
index c0934db0a..5c7efbc44 100644
--- a/usr.sbin/radiusctl/parser.c
+++ b/usr.sbin/radiusctl/parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser.c,v 1.4 2024/07/24 08:27:20 yasuoka Exp $	*/
+/*	$OpenBSD: parser.c,v 1.5 2024/09/02 04:45:22 yasuoka Exp $	*/
 
 /*
  * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
@@ -371,9 +371,11 @@ match_token(char *word, const struct token table[])
 				break;
 			match++;
 			res.session_seq = strtonum(word, 1, UINT_MAX, &errstr);
-			if (errstr != NULL)
+			if (errstr != NULL) {
 				printf("invalid argument: %s is %s for "
-				"\"session-id\"", word, errstr);
+				    "\"session-id\"\n", word, errstr);
+				return (NULL);
+			}
 			t = &table[i];
 		case MSGAUTH:
 			if (word != NULL &&