 @@ -1,14 +1,14 @@
-$NetBSD: storage,v 1.27 2019/05/29 02:34:19 msaitoh Exp $
+$NetBSD: storage,v 1.28 2021/10/21 13:21:53 andvar Exp $
 NetBSD Storage Roadmap
 ======================
 This is a small roadmap document, and deals with the storage and file
 systems side of the operating system. It discusses elements, projects,
 and goals that are under development or under discussion; and it is
 divided into three categories based on perceived priority.
 The following elements, projects, and goals are considered strategic
 priorities for the project:
 . Improving iscsi
 @@ -213,27 +213,27 @@ more drivers.
 . nvme support
 ----------------
 nvme ("NVM Express") is a hardware interface standard for PCI-attached
 SSDs. NetBSD now has a driver for these.
 Driver is now MPSAFE and uses bufq fcfs (i.e. no disksort()) already,
 so the most obvious software bottlenecks were treated. It still needs
 more testing on real hardware, and it may be good to investigate some further
 optimizations, such as DragonFly pbuf(9) or something similar.
 Semi-relatedly, it is also time for scsipi to become MPSAFE.
- - As of May 2016 a port of OpenBSD's driver has been commited. This
+ - As of May 2016 a port of OpenBSD's driver has been committed. This
    will be in -8.
  - The nvme driver is a backend to ld(4) and is fully is MPSAFE, but we
    still need to attend to I/O path bottlenecks like kern/53124.
    Better instrumentation is needed.
  - Contact msaitoh, agc, or jdolecek for further information.
 . lfs64
 --------
 LFS currently only supports volumes up to 2 TB. As LFS is of interest
 for use on shingled disks (which are larger than 2 TB) and also for
 use on disk arrays (ditto) this is something of a problem. A 64-bit
 @@ -318,31 +318,31 @@ but we can't write them.)
 Ideally someone would write ext3 and/or ext4 code, whether integrated
 with or separate from the ext2 code we already have. It might also
 make sense to port or wrap the Linux ext3 or ext4 code so it can be
 loaded as a GPL'd kernel module; it isn't clear if that would be more
 or less work than doing an implementation.
 Note however that implementing ext3 has already defeated several
 people; this is a harder project than it looks.
  - GSoc 2016 brought support for extents, and also ro support for dir
    hashes; jdolecek also implemented several frequently used ext4 features
    so most contemporary ext filesystems should be possible to mount
    read-write
- - still need rw dir_nhash and xattr (semi-easy), and eventually journalling
+ - still need rw dir_nhash and xattr (semi-easy), and eventually journaling
    (hard)
  - There is no clear timeframe or release target.
- - jdolecek is working on improving ext3/ext4 support (particularily
+ - jdolecek is working on improving ext3/ext4 support (particularly
-   journalling)
+   journaling)
 . Port hammer from Dragonfly
 ------------------------------
 While the motivation for and role of hammer isn't perhaps super
 persuasive, it would still be good to have it. Porting it from
 Dragonfly is probably not that painful (compared to, say, zfs) but as
 the Dragonfly and NetBSD VFS layers have diverged in different
 directions from the original 4.4BSD, may not be entirely trivial
 either.
  - As of January 2017 nobody is known to be working on this.

 @@ -26,27 +26,27 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
 /*
  * Protocol description for the mount program
  */
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
 %#ifndef __lint__
 %/*static char sccsid[] = "from: @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)mount.x	2.1 88/08/01 4.0 RPCSRC";*/
-%__RCSID("$NetBSD: mount.x,v 1.6 2004/07/01 22:52:34 kleink Exp $");
+%__RCSID("$NetBSD: mount.x,v 1.7 2021/10/21 13:21:53 andvar Exp $");
 %/*	$FreeBSD: src/include/rpcsvc/mount.x,v 1.7 2003/05/04 02:51:42 obrien Exp $	*/
 %#endif /* not __lint__ */
 #endif
 const MNTPATHLEN = 1024;	/* maximum bytes in a pathname argument */
 const MNTNAMLEN = 255;		/* maximum bytes in a name argument */
 const FHSIZE = 32;		/* size in bytes of a file handle */
 const FHSIZE3 = 64;		/* size in bytes of a file handle (v3) */
 /*
  * The fhandle is the file handle that the server passes to the client.
  * All file operations are done using the file handles to refer to a file
  * or a directory. The file handle can contain whatever information the
 @@ -134,28 +134,28 @@ struct exportnode {
 	exports ex_next;
 };
 program MOUNTPROG {
 	/*
 	 * Version one of the mount protocol communicates with version two
 	 * of the NFS protocol. Version three communicates with
 	 * version three of the NFS protocol. The only connecting
 	 * point is the fhandle structure, which is the same for both
 	 * protocols.
 	 */
 	version MOUNTVERS {
 		/*
-		 * Does no work. It is made available in all RPC services
+		 * Does not work. It is made available in all RPC services
-		 * to allow server reponse testing and timing
+		 * to allow server response testing and timing
 		 */
 		void
 		MOUNTPROC_NULL(void) = 0;
 		/*
 		 * If fhs_status is 0, then fhs_fhandle contains the
 	 	 * file handle for the directory. This file handle may
 		 * be used in the NFS protocol. This procedure also adds
 		 * a new entry to the mount list for this client mounting
 		 * the directory.
 		 * Unix authentication required.
 		 */
 		fhstatus
 @@ -188,28 +188,28 @@ program MOUNTPROG {
 		 * machines are allowed to import it.
 		 */
 		exports
 		MOUNTPROC_EXPORT(void)  = 5;
 		/*
 		 * Identical to MOUNTPROC_EXPORT above
 		 */
 		exports
 		MOUNTPROC_EXPORTALL(void) = 6;
 	} = 1;
 	version MOUNTVERS3 {
 		/*
-		 * Does no work. It is made available in all RPC services
+		 * Does not work. It is made available in all RPC services
-		 * to allow server reponse testing and timing
+		 * to allow server response testing and timing
 		 */
 		void
 		MOUNTPROC_NULL(void) = 0;
 		/*
 		 * If mountres3.fhs_status is MNT3_OK, then
 		 * mountres3.mountinfo contains the file handle for
 		 * the directory and a list of acceptable
 		 * authentication flavors.  This file handle may only
 		 * be used in the NFS version 3 protocol.  This
 		 * procedure also results in the server adding a new
 		 * entry to its mount list recording that this client
 		 * has mounted the directory. AUTH_UNIX authentication

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mfc.c,v 1.59 2021/08/07 16:18:41 thorpej Exp $ */
+/*	$NetBSD: mfc.c,v 1.60 2021/10/21 13:21:54 andvar Exp $ */
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
  * 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.
 @@ -45,27 +45,27 @@
  * 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 "opt_kgdb.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfc.c,v 1.59 2021/08/07 16:18:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfc.c,v 1.60 2021/10/21 13:21:54 andvar Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/uio.h>
 #include <sys/syslog.h>
 #include <sys/queue.h>
 #include <sys/conf.h>
 #include <sys/kauth.h>
 @@ -1043,27 +1043,27 @@ void
 mfcsxintr(int unit)
+{
 	int s1, s2, ovfl;
 	struct mfcs_softc *sc = device_lookup_private(&mfcs_cd, unit);
 	struct tty *tp = sc->sc_tty;
 	/*
 	 * Make sure we're not interrupted by another
 	 * vbl, but allow level6 ints
 	 */
 	s1 = spltty();
 	/*
-	 * pass along any acumulated information
+	 * pass along any accumulated information
 	 * while input is not blocked
 	 */
 	while (sc->incnt && (tp->t_state & TS_TBLOCK) == 0) {
 		/*
 		 * no collision with ser_fastint()
 		 */
 		mfcseint(unit, *sc->rptr++);
 		ovfl = 0;
 		/* lock against mfcs_fastint() */
 		s2 = splser();
 		--sc->incnt;
 		if (sc->rptr == sc->inbuf + SERIBUF_SIZE)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ser.c,v 1.83 2014/07/25 08:10:31 dholland Exp $ */
+/*	$NetBSD: ser.c,v 1.84 2021/10/21 13:21:54 andvar Exp $ */
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
  * 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.
 @@ -30,27 +30,27 @@
+ *
  *	@(#)ser.c	7.12 (Berkeley) 6/27/91
  */
 /*
  * XXX This file needs major cleanup it will never service more than one
  * XXX unit.
  */
 #include "opt_amigacons.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.83 2014/07/25 08:10:31 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.84 2021/10/21 13:21:54 andvar Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/queue.h>
 #include <sys/conf.h>
 @@ -532,27 +532,27 @@ ser_fastint(void)
 void
 serintr(void)
+{
 	int s1, s2, ovfl;
 	struct tty *tp = ser_tty;
 	/*
 	 * Make sure we're not interrupted by another
 	 * vbl, but allow level5 ints
 	 */
 	s1 = spltty();
 	/*
-	 * pass along any acumulated information
+	 * pass along any accumulated information
 	 */
 	while (sbcnt > 0 && (tp->t_state & TS_TBLOCK) == 0) {
 		/*
 		 * no collision with ser_fastint()
 		 */
 		sereint(*sbrpt++);
 		ovfl = 0;
 		/* lock against ser_fastint() */
 		s2 = splser();
 		sbcnt--;
 		if (sbrpt == serbuf + SERIBUF_SIZE)
 			sbrpt = serbuf;

 @@ -1,14 +1,14 @@
-/* $Id: imx23_ssp.c,v 1.7 2021/09/16 21:29:41 andvar Exp $ */
+/* $Id: imx23_ssp.c,v 1.8 2021/10/21 13:21:54 andvar Exp $ */
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Petri Laakso.
+ *
  * 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.
 @@ -540,27 +540,27 @@ issp_exec_command(sdmmc_chipset_handle_t
 		if (sc->sc_bus_width) {
 			aprint_error_dev(sc->sc_dev, "SSP_ERROR_IRQ: %d\n",
 			    sc->sc_irq_error);
+		}
 		else if(!(sc->sc_irq_error & HW_SSP_CTRL1_RESP_TIMEOUT_IRQ)) {
 			aprint_error_dev(sc->sc_dev, "SSP_ERROR_IRQ: %d\n",
 			    sc->sc_irq_error);
+		}
 		/* Shift unsigned error code so it fits nicely to signed int. */
 		cmd->c_error = sc->sc_irq_error >> 8;
+	}
-	/* Check reponse from the card if such was requested. */
+	/* Check response from the card if such was requested. */
 	if (ISSET(cmd->c_flags, SCF_RSP_PRESENT)) {
 		cmd->c_resp[0] = SSP_RD(sc, HW_SSP_SDRESP0);
 		if (ISSET(cmd->c_flags, SCF_RSP_136)) {
 			cmd->c_resp[1] = SSP_RD(sc, HW_SSP_SDRESP1);
 			cmd->c_resp[2] = SSP_RD(sc, HW_SSP_SDRESP2);
 			cmd->c_resp[3] = SSP_RD(sc, HW_SSP_SDRESP3);
 			/*
 			 * Remove CRC7 + LSB by rotating all bits right by 8 to
 			 * make sdmmc __bitfield() happy.
 			 */
 			cmd->c_resp[0] >>= 8; /* Remove CRC7 + LSB. */
 			cmd->c_resp[0] |= (0x000000FF & cmd->c_resp[1]) << 24;
 			cmd->c_resp[1] >>= 8;

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: dcr.h,v 1.1 2006/12/02 22:18:47 freza Exp $ */
+/* 	$NetBSD: dcr.h,v 1.2 2021/10/21 13:21:54 andvar Exp $ */
 /*
  * Copyright (c) 2006 Jachym Holecek
  * All rights reserved.
+ *
  * Written for DFC Design, s.r.o.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * 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.
  */
 /*
- * DCR is an user accesible bus on Xilinx PPC405D5Xn cores and may contain
+ * DCR is an user accessible bus on Xilinx PPC405D5Xn cores and may contain
  * arbitrary devices. Because we want to be able to share drivers with
  * OPB/PLB, we make it a bus space backend. Each platform ("design", "board")
  * has to provide the leaf _read_4/_write_4 routines specific to device
  * instances. This is dictated by the fact that DCR can only by accessed
  * by m{f,t}dcr instructions for which the address is encoded as immediate
  * operand (and hence needs to be a compile-time constant).
+ *
  * The flexibility is well worth the price of one indirection (and a sum
  * and a branch), critical paths can still be implemented with m{f,t}dcr().
  */
 #ifndef _VIRTEX_DCRVAR_H_
 #define _VIRTEX_DCRVAR_H_

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_hvnreg.h,v 1.1 2019/02/15 08:54:01 nonaka Exp $	*/
+/*	$NetBSD: if_hvnreg.h,v 1.2 2021/10/21 13:21:54 andvar Exp $	*/
 /*	$OpenBSD: if_hvnreg.h,v 1.3 2016/09/14 17:48:28 mikeb Exp $	*/
 /*-
  * Copyright (c) 2016 Microsoft Corp.
  * 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 unmodified, this list of conditions, and the following
  *    disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -86,27 +86,27 @@ struct hvn_nvs_init {
 	uint32_t	nvs_type;	/* HVN_NVS_TYPE_INIT */
 	uint32_t	nvs_ver_min;
 	uint32_t	nvs_ver_max;
 	uint8_t		nvs_rsvd[20];
 } __packed;
 struct hvn_nvs_init_resp {
 	uint32_t	nvs_type;	/* HVN_NVS_TYPE_INIT_RESP */
 	uint32_t	nvs_ver;	/* deprecated */
 	uint32_t	nvs_rsvd;
 	uint32_t	nvs_status;	/* HVN_NVS_STATUS_ */
 } __packed;
-/* No reponse */
+/* No response */
 struct hvn_nvs_ndis_conf {
 	uint32_t	nvs_type;	/* HVN_NVS_TYPE_NDIS_CONF */
 	uint32_t	nvs_mtu;
 	uint32_t	nvs_rsvd;
 	uint64_t	nvs_caps;	/* HVN_NVS_NDIS_CONF_ */
 	uint8_t		nvs_rsvd1[12];
 } __packed;
 #define HVN_NVS_NDIS_CONF_SRIOV		0x0004
 #define HVN_NVS_NDIS_CONF_VLAN		0x0008
 /* No response */
 struct hvn_nvs_ndis_init {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dm9000reg.h,v 1.6 2020/10/08 21:00:25 nisimura Exp $	*/
+/*	$NetBSD: dm9000reg.h,v 1.7 2021/10/21 13:21:54 andvar Exp $	*/
 /*
  * Copyright (c) 2009 Paul Fleischer
  * All rights reserved.
+ *
  * 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 company nor the name of the author may be used to
  *    endorse or promote products derived from this software without specific
  *    prior written permission.
 @@ -20,27 +20,27 @@
  * 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.
  */
 #ifndef _DEV_IC_DM9000REG_H_
 #define _DEV_IC_DM9000REG_H_
 /*
- * Registers accesible on the DM9000, extracted from pp. 11-12 from
+ * Registers accessible on the DM9000, extracted from pp. 11-12 from
  * the data sheet
  */
 /*
  * There are two interesting addresses for the DM9000 (at least in
  * the context of the FriendlyARM MINI2440) The I/O or register select
  * address, which is the base address.  The DATA address, which is
  * located at offset 4 from the base address.
+ *
  * Chances are that this will not work generally, as it really depends
  * on how the address lines are mapped from the CPU to the DM9000.
  * But for now it is a good starting point.
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ds1286reg.h,v 1.8 2005/12/11 12:21:26 christos Exp $ 	*/
+/*	$NetBSD: ds1286reg.h,v 1.9 2021/10/21 13:21:54 andvar Exp $ 	*/
 /*
  * Copyright (c) 2001 Rafal K. Boni
+ *
  * 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
 @@ -46,27 +46,27 @@
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /*
  * Definitions for the Dallas Semiconductor DS1286/DS1386 Real Time Clock.
+ *
- * Plucked right from the Dallas Semicomductor specs available at
+ * Plucked right from the Dallas Semiconductor specs available at
  * http://pdfserv.maxim-ic.com/arpdf/DS1286.pdf and
  * http://pdfserv.maxim-ic.com/arpdf/DS1386-DS1386P.pdf
+ *
  * The DS1286 and 1386 have 14 clock-related registers and some amount
  * of user registers (50 for the 1286, 8K or 32K for the 1386).  The
  * first eleven registers contain time-of-day and alarm data, the rest
  * contain various control bits and the watchdog timer functionality.
+ *
  * Since the locations of these ports and the method used to access
  * them can be machine-dependent, the low-level details of reading
  * and writing the RTC's registers are handled by machine-specific
  * functions.
+ *

 @@ -1,14 +1,14 @@
-/* $NetBSD: isp_library.c,v 1.8 2019/01/10 09:12:47 martin Exp $ */
+/* $NetBSD: isp_library.c,v 1.9 2021/10/21 13:21:54 andvar Exp $ */
 /*
  * Copyright (c) 2006-2007 by Matthew Jacob
  * 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.
 @@ -20,27 +20,27 @@
  * 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.
  */
 /*
  * Qlogic Host Adapter Internal Library Functions
  */
 #ifdef	__NetBSD__
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_library.c,v 1.8 2019/01/10 09:12:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_library.c,v 1.9 2021/10/21 13:21:54 andvar Exp $");
 #include <dev/ic/isp_netbsd.h>
 #endif
 #ifdef	__FreeBSD__
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 #include <dev/isp/isp_freebsd.h>
 #endif
 #ifdef	__OpenBSD__
 #include <dev/ic/isp_openbsd.h>
 #endif
 #ifdef	__linux__
 #include "isp_linux.h"
 #endif
 @@ -2256,27 +2256,27 @@ isp_allocate_xs_tgt(ispsoftc_t *isp, voi
+{
 	isp_hdl_t *hdp;
 	hdp = isp->isp_tgtfree;
 	if (hdp == NULL) {
 		return (-1);
+	}
 	isp->isp_tgtfree = hdp->cmd;
 	hdp->cmd = xs;
 	hdp->handle = (hdp - isp->isp_tgtlist);
 	hdp->handle |= (ISP_HANDLE_TARGET << ISP_HANDLE_USAGE_SHIFT);
 	/*
 	 * Target handles for SCSI cards are only 16 bits, so
-	 * sequence number protection will be ommitted.
+	 * sequence number protection will be omitted.
 	 */
 	if (IS_FC(isp)) {
 		hdp->handle |= (isp->isp_seqno++ << ISP_HANDLE_SEQ_SHIFT);
+	}
 	*handlep = hdp->handle;
 	return (0);
+}
 void *
 isp_find_xs_tgt(ispsoftc_t *isp, uint32_t handle)
+{
 	if (!ISP_VALID_TGT_HANDLE(isp, handle)) {
 		isp_prt(isp, ISP_LOGERR, "%s: bad handle 0x%x", __func__, handle);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ds1687reg.h,v 1.11 2018/11/08 06:43:52 msaitoh Exp $ 	*/
+/*	$NetBSD: ds1687reg.h,v 1.12 2021/10/21 13:21:54 andvar Exp $ 	*/
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Rafal K. Boni.
+ *
  * 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.
 @@ -53,27 +53,27 @@
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /*
  * Definitions for the Dallas Semiconductor DS1687 Real Time Clock.
+ *
  * The DS1687 and follow-on RTC chips are Y2k-compliant successors to the
  * DS1287, which in turn is register-compatible with the MC146818 and/or
  * MC146818A RTCs.
+ *
- * Plucked right from the Dallas Semicomductor specs available at:
+ * Plucked right from the Dallas Semiconductor specs available at:
  *	http://pdfserv.maxim-ic.com/arpdf/DS1685-DS1687.pdf
+ *
  * The DS1686 contains 14 basic clock-related registers and 50 bytes of
  * user RAM laid out for compatibility with the register layout of the
  * DS1287/MC14818 chips.  It also includes an extended mode which allows
  * access to these same basic registers as well an extended register
  * set and NVRAM area; this extended register set includes a century
  * register for Y2k compliant date storage.
+ *
  * Since the locations of these ports and the method used to access them
  * can be machine-dependent, the low-level details of reading and writing
  * writing the RTC's registers are handled by machine-specific functions.
+ *
 @@ -94,27 +94,27 @@
  * which allows the user to switch the RTC between a "compatible" mode in
  * bank 0 and an extended mode in bank 1.
+ *
  * Both banks provide access to the 14 timekeeping/alarm registers and
  * to 50 bytes of user RAM.  In addition, bank 0 provides access to an
  * additional 64 bytes of user RAM in the upper half of the RTC address
  * space.
+ *
  * Bank 1, on the other hand, provides access to an extended register set,
  * including a silicon serial number -- including a model ID byte, century
  * register for Y2k compatibility and memory address/data registers which
  * allow indirect access to a larger extended user RAM address space.  It
  * is worth noting that the extended user RAM is distinct from the "basic"
- * 114 bytes of user RAM which are accesible in bank 0.
+ * 114 bytes of user RAM which are accessible in bank 0.
  */
 /*
  * The registers, and the bits within each register.
  */
 #define	DS1687_SEC	0x00	/* Time of year: seconds (0-59) */
 #define DS1687_ASEC	0x01	/* Alarm: seconds */
 #define	DS1687_MIN	0x02	/* Time of year: minutes (0-59) */
 #define	DS1687_AMIN	0x03	/* Alarm: minutes */
 #define	DS1687_HOUR	0x04	/* Time of year: hour (see above) */
 #define	DS1687_AHOUR	0x05	/* Alarm: hour (see above) */
 #define	DS1687_DOW	0x06	/* Time of year: day of week (1-7, 1 = Sun) */

 @@ -1,14 +1,14 @@
-/* $NetBSD: isp.c,v 1.130 2021/09/19 10:34:09 andvar Exp $ */
+/* $NetBSD: isp.c,v 1.131 2021/10/21 13:21:54 andvar Exp $ */
 /*
  * Machine and OS Independent (well, as best as possible)
  * code for the Qlogic ISP SCSI adapters.
+ *
  * Copyright (C) 1997, 1998, 1999 National Aeronautics & Space Administration
  * All rights reserved.
+ *
  * Additional Copyright (C) 2000-2007 by Matthew Jacob
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -33,27 +33,27 @@
  */
 /*
  * Inspiration and ideas about this driver are from Erik Moe's Linux driver
  * (qlogicisp.c) and Dave Miller's SBus version of same (qlogicisp.c). Some
  * ideas dredged from the Solaris driver.
  */
 /*
  * Include header file appropriate for platform we're building on.
  */
 #ifdef	__NetBSD__
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.130 2021/09/19 10:34:09 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.131 2021/10/21 13:21:54 andvar Exp $");
 #include <dev/ic/isp_netbsd.h>
 #endif
 #ifdef	__FreeBSD__
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 #include <dev/isp/isp_freebsd.h>
 #endif
 #ifdef	__OpenBSD__
 #include <dev/ic/isp_openbsd.h>
 #endif
 #ifdef	__linux__
 #include "isp_linux.h"
 #endif
 @@ -6222,27 +6222,27 @@ isp_parse_status(ispsoftc_t *isp, ispsta
 	case RQCS_BAD_ENTRY:
 		isp_prt(isp, ISP_LOGERR, "Invalid IOCB entry type detected");
 		break;
 	case RQCS_QUEUE_FULL:
 		isp_xs_prt(isp, xs, ISP_LOGDEBUG0, "internal queues full status 0x%x", *XS_STSP(xs));
 		/*
 		 * If QFULL or some other status byte is set, then this
 		 * isn't an error, per se.
+		 *
 		 * Unfortunately, some QLogic f/w writers have, in
-		 * some cases, ommitted to *set* status to QFULL.
+		 * some cases, omitted to *set* status to QFULL.
+		 *
 		if (*XS_STSP(xs) != SCSI_GOOD && XS_NOERR(xs)) {
 			XS_SETERR(xs, HBA_NOERROR);
 			return;
+		}
+		 *
+		 *
 		 */
 		*XS_STSP(xs) = SCSI_QFULL;
 		XS_SETERR(xs, HBA_NOERROR);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_sip.c,v 1.182 2020/03/16 01:54:23 thorpej Exp $	*/
+/*	$NetBSD: if_sip.c,v 1.183 2021/10/21 13:21:54 andvar Exp $	*/
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
 @@ -63,27 +63,27 @@
  * SiS 7016 10/100, National Semiconductor DP83815 10/100, and
  * National Semiconductor DP83820 10/100/1000 PCI Ethernet
  * controllers.
+ *
  * Originally written to support the SiS 900 by Jason R. Thorpe for
  * Network Computer, Inc.
+ *
  * TODO:
+ *
  *	- Reduce the Rx interrupt load.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.182 2020/03/16 01:54:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.183 2021/10/21 13:21:54 andvar Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/rndsource.h>
 @@ -878,27 +878,27 @@ sipcom_dp83820_attach(struct sip_softc *
 			 * that it's in a 64-bit slot because I guess they
 			 * wired up ACK64# and REQ64#).
 			 */
 			if (gsip_disable_data64)
 				using64 = "force-disabled";
 			else if (sipcom_check_64bit(pa)) {
 				sc->sc_cfg |= CFG_DATA64_EN;
 				using64 = "enabled";
 			} else
 				using64 = "disabled (32-bit card)";
 		} else {
 			using64 = "disabled in EEPROM";
+		}
-		printf("%s: 64-bit slot detected, 64-bit tranfers %s\n",
+		printf("%s: 64-bit slot detected, 64-bit transfers %s\n",
 		    device_xname(sc->sc_dev), using64);
+	}
 	/*
 	 * The T64ADDR bit is loaded by the chip from the EEPROM and
 	 * is read-only.
 	 */
 	if (reg & CFG_T64ADDR)
 		sc->sc_cfg |= CFG_T64ADDR;
 	/*
 	 * We can use 64-bit DMA addressing regardless of what
 	 * sort of slot we're in.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys_futex.c,v 1.13 2021/09/28 15:05:42 thorpej Exp $	*/
+/*	$NetBSD: sys_futex.c,v 1.14 2021/10/21 13:21:54 andvar Exp $	*/
 /*-
  * Copyright (c) 2018, 2019, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell and Jason R. Thorpe.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 FOUNDATION OR CONTRIBUTORS
  * 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/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.13 2021/09/28 15:05:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_futex.c,v 1.14 2021/10/21 13:21:54 andvar Exp $");
 /*
  * Futexes
+ *
  *	The futex system call coordinates notifying threads waiting for
  *	changes on a 32-bit word of memory.  The word can be managed by
  *	CPU atomic operations in userland, without system calls, as long
  *	as there is no contention.
+ *
  *	The simplest use case demonstrating the utility is:
+ *
  *		// 32-bit word of memory shared among threads or
  *		// processes in userland.  lock & 1 means owned;
 @@ -735,27 +735,27 @@ futex_lookup_create(int *uaddr, bool sha
 	 * it.
 	 */
 	error = futex_lookup_by_key(&fk, shared, fp);
 	if (error || *fp != NULL) {
 		/*
 		 * We either found one, or there was an error.
 		 * In either case, we are done with the key.
 		 */
 		futex_key_fini(&fk, shared);
 		goto out;
+	}
 	/*
-	 * Create a futex recoard.  This tranfers ownership of the key
+	 * Create a futex record.  This transfers ownership of the key
 	 * in all cases.
 	 */
 	f = futex_create(&fk, shared);
 	if (f == NULL) {
 		error = ENOMEM;
 		goto out;
+	}
 	/*
 	 * Insert our new futex, or use existing if someone else beat
 	 * us to it.
 	 */
 	error = futex_insert(f, fp);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: panic_string.c,v 1.2 2020/01/30 07:58:33 kamil Exp $	*/
+/*	$NetBSD: panic_string.c,v 1.3 2021/10/21 13:21:55 andvar Exp $	*/
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * 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.
 @@ -18,52 +18,52 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * 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/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: panic_string.c,v 1.2 2020/01/30 07:58:33 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: panic_string.c,v 1.3 2021/10/21 13:21:55 andvar Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/lwp.h>
 #include <sys/module.h>
 #include <sys/vfs_syscalls.h>
 /*
  * Create a device /dev/panic from which you can read sequential
  * user input.
+ *
  * To use this device you need to do:
  *      mknod /dev/panic c 351 0
+ *
  * To write to the device you might need:
  *      chmod 666 /dev/panic
+ *
  * Commentary:
  * This module manages the device /dev/panic,
- * tranfers a string from userspace to kernel space
+ * transfers a string from userspace to kernel space
  * and calls kernel panic with the passed string.
+ *
  *  echo 'string' > /dev/panic
  * will do the trick after loading the module.
  */
 dev_type_open(panic_string_open);
 dev_type_close(panic_string_close);
 dev_type_write(panic_string_write);
 static struct cdevsw panic_string_cdevsw = {
 	.d_open = panic_string_open,
 	.d_close = panic_string_close,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sctp_output.c,v 1.25 2021/09/07 13:24:46 andvar Exp $ */
+/*	$NetBSD: sctp_output.c,v 1.26 2021/10/21 13:21:55 andvar Exp $ */
 /*	$KAME: sctp_output.c,v 1.48 2005/06/16 18:29:24 jinmei Exp $	*/
 /*
  * Copyright (C) 2002, 2003, 2004 Cisco Systems Inc,
  * 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
 @@ -20,27 +20,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``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 PROJECT OR CONTRIBUTORS 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/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.25 2021/09/07 13:24:46 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.26 2021/10/21 13:21:55 andvar Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
 #include "opt_inet.h"
 #include "opt_sctp.h"
 #endif /* _KERNEL_OPT */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 @@ -4350,27 +4350,27 @@ sctp_msg_append(struct sctp_tcb *stcb,
 		chk->data = m;
 		m = NULL;
 		/* Total in the MSIZE */
 		for (mm = chk->data; mm; mm = mm->m_next) {
 			mbcnt += MSIZE;
 			if (mm->m_flags & M_EXT) {
 				mbcnt += chk->data->m_ext.ext_size;
+			}
+		}
 		/* fix up the send_size if it is not present */
 		chk->send_size = dataout;
 		chk->book_size = chk->send_size;
 		chk->mbcnt = mbcnt;
-		/* ok, we are commited */
+		/* ok, we are committed */
 		if ((srcv->sinfo_flags & SCTP_UNORDERED) == 0) {
 			/* bump the ssn if we are unordered. */
 			strq->next_sequence_sent++;
+		}
 		chk->data->m_nextpkt = 0;
 		asoc->stream_queue_cnt++;
 		TAILQ_INSERT_TAIL(&strq->outqueue, chk, sctp_next);
 		/* now check if this stream is on the wheel */
 		if ((strq->next_spoke.tqe_next == NULL) &&
 		    (strq->next_spoke.tqe_prev == NULL)) {
 			/* Insert it on the wheel since it is not
 			 * on it currently
 			 */
 @@ -4465,27 +4465,27 @@ sctp_msg_append(struct sctp_tcb *stcb,
 			chk->mbcnt = mbcnt_e;
 			mbcnt += mbcnt_e;
 			if (chk->flags & SCTP_PR_SCTP_BUFFER) {
 				asoc->sent_queue_cnt_removeable++;
+			}
 			n = n->m_nextpkt;
 			TAILQ_INSERT_TAIL(&tmp, chk, sctp_next);
+		}
 		m = NULL;
 		/* now that we have enough space for all de-couple the
 		 * chain of mbufs by going through our temp array
 		 * and breaking the pointers.
 		 */
-		/* ok, we are commited */
+		/* ok, we are committed */
 		if ((srcv->sinfo_flags & SCTP_UNORDERED) == 0) {
 			/* bump the ssn if we are unordered. */
 			strq->next_sequence_sent++;
+		}
 		/* Mark the first/last flags. This will
 		 * result int a 3 for a single item on the list
 		 */
 		chk = TAILQ_FIRST(&tmp);
 		chk->rec.data.rcv_flags |= SCTP_DATA_FIRST_FRAG;
 		chk = TAILQ_LAST(&tmp, sctpchunk_listhead);
 		chk->rec.data.rcv_flags |= SCTP_DATA_LAST_FRAG;
 		/* now break any chains on the queue and
 		 * move it to the streams actual queue.
 @@ -9567,27 +9567,27 @@ sctp_copy_it_in(struct sctp_inpcb *inp,
 		mbcnt += mbcnt_e;
 		mbcnt_e = 0;
 		mm->m_pkthdr.len = tot_out;
 		chk->data = mm;
 		mm = NULL;
 		/* the actual chunk flags */
 		chk->rec.data.rcv_flags |= SCTP_DATA_NOT_FRAG;
 		chk->whoTo->ref_count++;
 		/* fix up the send_size if it is not present */
 		chk->send_size = tot_out;
 		chk->book_size = chk->send_size;
-		/* ok, we are commited */
+		/* ok, we are committed */
 		if ((srcv->sinfo_flags & SCTP_UNORDERED) == 0) {
 			/* bump the ssn if we are unordered. */
 			strq->next_sequence_sent++;
+		}
 		if (chk->flags & SCTP_PR_SCTP_BUFFER) {
 			asoc->sent_queue_cnt_removeable++;
+		}
 		solock(so);
 		if ((asoc->state == 0) ||
 		    (my_vtag != asoc->my_vtag) ||
 		    (so != inp->sctp_socket) ||
 		    (inp->sctp_socket == 0)) {
 			/* connection was aborted */

 @@ -1,14 +1,14 @@
-/*	 $NetBSD: nfsnode.h,v 1.75 2021/07/18 23:57:15 dholland Exp $	*/
+/*	 $NetBSD: nfsnode.h,v 1.76 2021/10/21 13:21:55 andvar Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
+ *
  * 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.
 @@ -88,27 +88,27 @@ struct nfsdircache {
  * The nfsnode is the nfs equivalent to ufs's inode. Any similarity
  * is purely coincidental.
  * There is a unique nfsnode allocated for each active file,
  * each current directory, each mounted-on file, text file, and the root.
  * An nfsnode is 'named' by its file handle. (nget/nfs_node.c)
  */
 struct nfsnode_spec {
 	struct timespec	nspec_mtim;	/* local mtime */
 	struct timespec	nspec_atim;	/* local atime */
 };
 struct nfsnode_reg {
-	off_t nreg_pushedlo;		/* 1st blk in commited range */
+	off_t nreg_pushedlo;		/* 1st blk in committed range */
 	off_t nreg_pushedhi;		/* Last block in range */
 	off_t nreg_pushlo;		/* 1st block in commit range */
 	off_t nreg_pushhi;		/* Last block in range */
 	kmutex_t nreg_commitlock;	/* Serialize commits XXX */
 	int nreg_commitflags;
 	int nreg_error;			/* Save write error value */
 };
 struct nfsnode_dir {
 	off_t ndir_direof;		/* EOF offset cache */
 	nfsuint64 ndir_cookieverf;	/* Cookie verifier */
 	struct nfsdirhashhead *ndir_dircache; /* offset -> cache hash heads */
 	struct nfsdirchainhead ndir_dirchain; /* Chain of dir cookies */

 @@ -1,14 +1,14 @@
-# $NetBSD: t_config.sh,v 1.10 2020/03/09 20:33:16 christos Exp $
+# $NetBSD: t_config.sh,v 1.11 2021/10/21 13:21:55 andvar Exp $
+#
 # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
 # 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.
+#
 @@ -125,27 +125,27 @@ test_case()
 	eval "${name}_body() { \
 		run_and_check_${type} '${name}'; \
 	}"
+}
 test_case shadow_instance pass "Checks correct handling of shadowed instances"
 test_case loop pass "Checks correct handling of loops"
 test_case loop2 pass "Checks correct handling of devices that can be their" \
     "own parents"
 test_case pseudo_parent pass "Checks correct handling of children of pseudo" \
     "devices (PR/32329)"
 test_case postponed_orphan fail "Checks that config catches adding an" \
     "instance of a child of a negated instance as error"
-test_case no_pseudo fail "Checks that config catches ommited 'pseudo-device'" \
+test_case no_pseudo fail "Checks that config catches omitted 'pseudo-device'" \
     "as error (PR/34111)"
 test_case deffs_redef fail "Checks that config doesn't allow a deffs to use" \
     "the same name as a previous defflag/defparam"
 # Selecting an undefined option.
 undefined_opt_config_str="
 include \"${srcdir}/d_min\"
 options UNDEFINED
+"
 test_case undefined_opt pass \
     "Checks that config allows a selection for an undefined options"
 # Negating an undefined option.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mtrace.c,v 1.42 2019/02/03 03:19:31 mrg Exp $	*/
+/*	$NetBSD: mtrace.c,v 1.43 2021/10/21 13:21:55 andvar Exp $	*/
 /*
  * mtrace.c
+ *
  * This tool traces the branch of a multicast tree from a source to a
  * receiver for a particular multicast group and gives statistics
  * about packet rate and loss for each hop along the path.  It can
  * usually be invoked just as
+ *
  * 	mtrace source
+ *
  * to trace the route from that source to the local host for a default
  * group when only the route is desired and not group-specific packet
 @@ -42,27 +42,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS 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/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mtrace.c,v 1.42 2019/02/03 03:19:31 mrg Exp $");
+__RCSID("$NetBSD: mtrace.c,v 1.43 2021/10/21 13:21:55 andvar Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <poll.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <memory.h>
 #include <netdb.h>
 #include <string.h>
 #include <ifaddrs.h>
 @@ -1176,27 +1176,27 @@ main(int argc, char **argv)
 		arg = p;
 		p = "";
 	    } else if (argc > 0) arg = argv[0];
 	    switch (c) {
 	      case 'd':			/* Unlisted debug print option */
 		if (arg && isdigit((unsigned char)*arg)) {
 		    debug = atoi(arg);
 		    if (debug < 0) debug = 0;
 		    if (debug > 3) debug = 3;
 		    if (arg == argv[0]) argv++, argc--;
 		    break;
 		} else
 		    goto usage;
-	      case 'M':			/* Use multicast for reponse */
+	      case 'M':			/* Use multicast for response */
 		multicast = TRUE;
 		break;
 	      case 'l':			/* Loop updating stats indefinitely */
 		numstats = 3153600;
 		break;
 	      case 'n':			/* Don't reverse map host addresses */
 		numeric = TRUE;
 		break;
 	      case 'p':			/* Passive listen for traces */
 		passive = TRUE;
 		break;
 	      case 'v':			/* Verbosity */
 		verbose = TRUE;

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.26 2021/04/26 07:17:30 mrg Exp $
+#	$NetBSD: Makefile,v 1.27 2021/10/21 13:21:53 andvar Exp $
 WARNS=	3
 USE_FORT?= yes	# data-driven bugs?
 .include <bsd.own.mk>
 USE_SHLIBDIR=	yes
 ZLIBDIR=${NETBSDSRCDIR}/common/dist/zlib
 .PATH: ${ZLIBDIR}
 LIB=		z
 @@ -27,17 +27,17 @@ FILES+=			zlib.pc
 FILESOWN_zlib.pc=	${BINOWN}
 FILESGRP_zlib.pc=	${BINGRP}
 FILESMODE_zlib.pc=	${NONBINMODE}
 FILESDIR_zlib.pc=	/usr/lib/pkgconfig
 COPTS.infback.c+=	${GCC_NO_IMPLICIT_FALLTHRU}
 COPTS.inflate.c+=	${GCC_NO_IMPLICIT_FALLTHRU}
 .include <bsd.lib.mk>
 test: minigzip
 	echo hello world | ./minigzip | ./minigzip -d
-# Note: CFLAGS ommitted by intention!
+# Note: CFLAGS omitted by intention!
 # This is to verify that zlib.h works standalone.
 minigzip: ${ZLIBDIR}/test/minigzip.c libz.a
 	${CC} -o minigzip ${ZLIBDIR}/test/minigzip.c libz.a

 @@ -1,14 +1,14 @@
-.\" $NetBSD: vio9p.4,v 1.3 2019/10/28 13:43:10 wiz Exp $
+.\" $NetBSD: vio9p.4,v 1.4 2021/10/21 13:21:53 andvar Exp $
 .\"
 .\" Copyright (c) 2019 Internet Initiative Japan, Inc.
 .\" 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.
 .\"
 @@ -34,27 +34,27 @@
 .Cd "vio9p* at virtio?"
 .Sh DESCRIPTION
 In conjunction with
 .Xr mount_9p 8 ,
 the
 .Nm
 driver enables a
 .Nx
 system running as a VM guest to mount an exported file system
 by the host via virtio-9p.
 It exports a 9p end-point of virtio-9p via a character device file for
 .Xr mount_9p 8 .
 .Pp
-Each exported file system is assigned a character device and accesible via
+Each exported file system is assigned a character device and accessible via
 .Pa /dev/vio9p0 ,
 .Pa /dev/vio9p1
 and so on, respectively, in exporting order by the host.
 .Sh FILES
 .Bl -tag -width XdevXvio9pX -compact
 .It Pa /dev/vio9p?
 .El
 .Sh EXAMPLES
 The following command mounts the first exported file system by the host at
 .Pa /mnt/9p :
 .Bd -literal -offset indent
 # mount_9p -cu /dev/vio9p0 /mnt/9p
 .Ed

 @@ -1,14 +1,14 @@
-.\" $NetBSD: pdc.4,v 1.3 2017/07/03 21:30:59 wiz Exp $
+.\" $NetBSD: pdc.4,v 1.4 2021/10/21 13:21:53 andvar Exp $
 .\"
 .\" $OpenBSD: pdc.4,v 1.6 2007/06/01 19:54:10 aanriot Exp $
 .\"
 .\" Copyright (c) 2004 Michael Shalayeff
 .\" 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
 @@ -51,27 +51,27 @@ on other systems.
 PDC procedure calls are all made through a single entry point
 and assume normal C language calling conventions, with option
 number in the first argument and the return data address in the
 second, unless indicated otherwise.
 Each call requires at most 7KB of the available stack.
 Here is the list of procedures and options descriptions:
 .Bl -tag -width pdc
 .It Fn pdc "PDC_ADD_VALID" "PDC_ADD_VALID_DFLT" "paddr"
 Perform a read operation attempt at the physical address
 .Ar paddr
 without causing a HPMC, in order to verify that the address is valid
 and there is a device to respond to it.
 The implementation may choose to call the caller's HPMC handler and
-raise error conditions on the bus convertors.
+raise error conditions on the bus converters.
 .It Fn pdc "PDC_ALLOC" "PDC_ALLOC_DFLT" "ptr" "size"
 Allocate static storage for IODC use of
 .Ar size
 bytes and return the address in a word pointed to by the
 .Ar ptr
 argument.
 There is no way of freeing the storage allocated and thus
 care shall be taken to not exhaust the total allocation limit of 32KB.
 .It Fn pdc "PDC_BLOCK_TLB" "PDC_BTLB_DEFAULT" "ptr"
 Get block TLB parameters into the data area pointed to by the
 .Ar ptr
 argument.
 This includes minimal and maximal entry size and number of fixed and

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: statvfs.5,v 1.15 2019/09/22 22:59:38 christos Exp $
+.\"	$NetBSD: statvfs.5,v 1.16 2021/10/21 13:21:53 andvar Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  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. Neither the name of the University nor the names of its contributors
 @@ -108,27 +108,27 @@ Union with underlying filesystem instead
 .It Dv ST_SYNCHRONOUS
 All I/O to the filesystem is done synchronously.
 .It Dv ST_ASYNC
 No filesystem I/O is done synchronously.
 .It Dv ST_NOCOREDUMP
 Don't write core dumps to this file system.
 .It Dv ST_NOATIME
 Never update access times.
 .It Dv ST_SYMPERM
 Recognize symbolic link permission.
 .It Dv ST_NODEVMTIME
 Never update modification times for device files.
 .It Dv ST_LOG
-Use logging (journalling).
+Use logging (journaling).
 .It Dv ST_LOCAL
 The filesystem resides locally.
 .It Dv ST_QUOTA
 The filesystem has quotas enabled on it.
 .It Dv ST_ROOTFS
 Identifies the root filesystem.
 .It Dv ST_EXRDONLY
 The filesystem is exported read-only.
 .It Dv ST_EXPORTED
 The filesystem is exported for both reading and writing.
 .It Dv ST_DEFEXPORTED
 The filesystem is exported for both reading and writing to any Internet host.
 .It Dv ST_EXPORTANON

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: sysctl.7,v 1.154 2021/07/28 11:32:21 wiz Exp $
+.\"	$NetBSD: sysctl.7,v 1.155 2021/10/21 13:21:54 andvar Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  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. Neither the name of the University nor the names of its contributors
 @@ -149,27 +149,27 @@ Controls if expansion of variables is go
 or not.
 Defaults to no variable expansion,
 .Dv 0 .
 Variables are of the form
 .Li @name
 and the variables supported are described in
 .Xr symlink 7
 under
 .Dq "MAGIC SYMLINKS" .
 .El
 .Pp
 A second level name for controlling the
 .Xr wapbl 4
-(Write Ahead Physical Block Logging file system journalling)
+(Write Ahead Physical Block Logging file system journaling)
 capabilities with the following third level identifiers:
 .Bl -tag -width "123456"
 .It Li vfs.wapbl.flush_disk_cache
 Controls whether to attempt to flush the disk cache on each commit.
 It defaults to 1 and it should always be on to ensure integrity
 of file system metadata in the event of a power loss.
 For slow disks, turning it off can improve performance.
 .It Li vfs.wapbl.verbose_commit
 For each transaction log commit, print the number of bytes written
 and the time it took to commit as seconds.nanoseconds.
 .El
 .Pp
 The remaining second level identifiers are the file system names, identified