Module Name: src Committed By: andvar Date: Sat Sep 11 20:28:06 UTC 2021
Modified Files: src/lib/libc/gen: randomid.c src/lib/libc/include: namespace.h src/lib/libpuffs: null.c src/sys/arch/acorn32/podulebus: podulebus.c src/sys/arch/arm/rockchip: rk_tsadc.c src/sys/arch/cesfic/dev: zs.c src/sys/arch/cobalt/dev: zs.c src/sys/arch/ews4800mips/dev: zs.c src/sys/arch/mac68k/dev: zs.c src/sys/arch/macppc/dev: zs.c src/sys/arch/mipsco/obio: zs.c src/sys/arch/mvme68k/dev: zs.c src/sys/arch/news68k/dev: zs.c src/sys/arch/newsmips/dev: zs.c src/sys/arch/next68k/dev: zs.c src/sys/arch/powerpc/booke: e500_intr.c src/sys/arch/powerpc/include/booke: vmparam.h src/sys/arch/powerpc/include/oea: vmparam.h src/sys/arch/sgimips/dev: zs.c src/sys/arch/sparc/dev: sx.c zs.c src/sys/arch/sparc64/dev: zs.c src/sys/arch/sun2/dev: zs.c src/sys/arch/sun3/dev: zs.c src/sys/arch/x68k/dev: zs.c src/sys/conf: Makefile.kern.inc src/sys/dev: mm.h src/sys/dev/ic: dm9000.c dwc_gmac.c isp.c ispvar.h src/sys/dev/tc: zs_ioasic.c src/tests/usr.bin/patch: t_patch.sh src/usr.bin/config: config.5 src/usr.bin/kdump: mksiginfos src/usr.bin/tip: acu.c src/usr.sbin/sysinst: README.md_defs partitions.c partitions.h Log Message: Add missing double p and d for stopped and overriden accordingly. Fix few more typos along the way, mainly in copy-pasted comments. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/gen/randomid.c cvs rdiff -u -r1.201 -r1.202 src/lib/libc/include/namespace.h cvs rdiff -u -r1.35 -r1.36 src/lib/libpuffs/null.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/acorn32/podulebus/podulebus.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/rockchip/rk_tsadc.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/cesfic/dev/zs.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/cobalt/dev/zs.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ews4800mips/dev/zs.c cvs rdiff -u -r1.60 -r1.61 src/sys/arch/mac68k/dev/zs.c cvs rdiff -u -r1.53 -r1.54 src/sys/arch/macppc/dev/zs.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mipsco/obio/zs.c cvs rdiff -u -r1.44 -r1.45 src/sys/arch/mvme68k/dev/zs.c cvs rdiff -u -r1.33 -r1.34 src/sys/arch/news68k/dev/zs.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/newsmips/dev/zs.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/next68k/dev/zs.c cvs rdiff -u -r1.44 -r1.45 src/sys/arch/powerpc/booke/e500_intr.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/include/booke/vmparam.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/include/oea/vmparam.h cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sgimips/dev/zs.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc/dev/sx.c cvs rdiff -u -r1.123 -r1.124 src/sys/arch/sparc/dev/zs.c cvs rdiff -u -r1.77 -r1.78 src/sys/arch/sparc64/dev/zs.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sun2/dev/zs.c cvs rdiff -u -r1.90 -r1.91 src/sys/arch/sun3/dev/zs.c cvs rdiff -u -r1.46 -r1.47 src/sys/arch/x68k/dev/zs.c cvs rdiff -u -r1.281 -r1.282 src/sys/conf/Makefile.kern.inc cvs rdiff -u -r1.3 -r1.4 src/sys/dev/mm.h cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/dm9000.c cvs rdiff -u -r1.74 -r1.75 src/sys/dev/ic/dwc_gmac.c cvs rdiff -u -r1.128 -r1.129 src/sys/dev/ic/isp.c cvs rdiff -u -r1.73 -r1.74 src/sys/dev/ic/ispvar.h cvs rdiff -u -r1.43 -r1.44 src/sys/dev/tc/zs_ioasic.c cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/patch/t_patch.sh cvs rdiff -u -r1.45 -r1.46 src/usr.bin/config/config.5 cvs rdiff -u -r1.5 -r1.6 src/usr.bin/kdump/mksiginfos cvs rdiff -u -r1.17 -r1.18 src/usr.bin/tip/acu.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/README.md_defs cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/partitions.c cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/sysinst/partitions.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libc/gen/randomid.c diff -u src/lib/libc/gen/randomid.c:1.14 src/lib/libc/gen/randomid.c:1.15 --- src/lib/libc/gen/randomid.c:1.14 Fri Dec 27 09:25:57 2019 +++ src/lib/libc/gen/randomid.c Sat Sep 11 20:28:03 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: randomid.c,v 1.14 2019/12/27 09:25:57 msaitoh Exp $ */ +/* $NetBSD: randomid.c,v 1.15 2021/09/11 20:28:03 andvar Exp $ */ /* $KAME: ip6_id.c,v 1.8 2003/09/06 13:41:06 itojun Exp $ */ /* $OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert Exp $ */ @@ -76,14 +76,14 @@ * 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. */ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: randomid.c,v 1.14 2019/12/27 09:25:57 msaitoh Exp $"); +__RCSID("$NetBSD: randomid.c,v 1.15 2021/09/11 20:28:03 andvar Exp $"); #endif #include "namespace.h" Index: src/lib/libc/include/namespace.h diff -u src/lib/libc/include/namespace.h:1.201 src/lib/libc/include/namespace.h:1.202 --- src/lib/libc/include/namespace.h:1.201 Sun Jul 4 16:18:50 2021 +++ src/lib/libc/include/namespace.h Sat Sep 11 20:28:03 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: namespace.h,v 1.201 2021/07/04 16:18:50 rillig Exp $ */ +/* $NetBSD: namespace.h,v 1.202 2021/09/11 20:28:03 andvar Exp $ */ /*- * Copyright (c) 1997-2004 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ /* * namespace protection for libc functions that are used internally - * in libc and should be not overriden by applications. To do this, + * in libc and should be not overridden by applications. To do this, * this header renames them to a name that starts with an "_" so that * libc uses the "_" flavor internally (and this name is not part of * the application namespace), and then a weak alias is added to the Index: src/lib/libpuffs/null.c diff -u src/lib/libpuffs/null.c:1.35 src/lib/libpuffs/null.c:1.36 --- src/lib/libpuffs/null.c:1.35 Sat Nov 2 18:14:36 2019 +++ src/lib/libpuffs/null.c Sat Sep 11 20:28:03 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: null.c,v 1.35 2019/11/02 18:14:36 tnn Exp $ */ +/* $NetBSD: null.c,v 1.36 2021/09/11 20:28:03 andvar Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -27,7 +27,7 @@ #include <sys/cdefs.h> #if !defined(lint) -__RCSID("$NetBSD: null.c,v 1.35 2019/11/02 18:14:36 tnn Exp $"); +__RCSID("$NetBSD: null.c,v 1.36 2021/09/11 20:28:03 andvar Exp $"); #endif /* !lint */ /* @@ -159,7 +159,7 @@ makenode(struct puffs_usermount *pu, str return 0; } -/* This should be called first and overriden from the file system */ +/* This should be called first and overridden from the file system */ void puffs_null_setops(struct puffs_ops *pops) { Index: src/sys/arch/acorn32/podulebus/podulebus.c diff -u src/sys/arch/acorn32/podulebus/podulebus.c:1.32 src/sys/arch/acorn32/podulebus/podulebus.c:1.33 --- src/sys/arch/acorn32/podulebus/podulebus.c:1.32 Sat Aug 7 16:18:40 2021 +++ src/sys/arch/acorn32/podulebus/podulebus.c Sat Sep 11 20:28:03 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: podulebus.c,v 1.32 2021/08/07 16:18:40 thorpej Exp $ */ +/* $NetBSD: podulebus.c,v 1.33 2021/09/11 20:28:03 andvar Exp $ */ /* * Copyright (c) 1994-1996 Mark Brinicombe. @@ -43,7 +43,7 @@ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.32 2021/08/07 16:18:40 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.33 2021/09/11 20:28:03 andvar Exp $"); #include <sys/systm.h> #include <sys/kernel.h> @@ -484,7 +484,7 @@ podulebusattach(device_t parent, device_ /* Any old description is now wrong */ podules[loop].description[0] = 0; if (value != 0xffff) { - printf("podule%d: ID overriden man=%04x prod=%04x\n", + printf("podule%d: ID overridden man=%04x prod=%04x\n", loop, podules[loop].manufacturer, podules[loop].product); podules[loop].slottype = SLOT_POD; Index: src/sys/arch/arm/rockchip/rk_tsadc.c diff -u src/sys/arch/arm/rockchip/rk_tsadc.c:1.13 src/sys/arch/arm/rockchip/rk_tsadc.c:1.14 --- src/sys/arch/arm/rockchip/rk_tsadc.c:1.13 Sat Jun 12 00:04:46 2021 +++ src/sys/arch/arm/rockchip/rk_tsadc.c Sat Sep 11 20:28:03 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: rk_tsadc.c,v 1.13 2021/06/12 00:04:46 mrg Exp $ */ +/* $NetBSD: rk_tsadc.c,v 1.14 2021/09/11 20:28:03 andvar Exp $ */ /* * Copyright (c) 2019 Matthew R. Green @@ -30,7 +30,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rk_tsadc.c,v 1.13 2021/06/12 00:04:46 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rk_tsadc.c,v 1.14 2021/09/11 20:28:03 andvar Exp $"); /* * Driver for the TSADC temperature sensor monitor in RK3328 and RK3399. @@ -247,7 +247,7 @@ static const struct rk_tsadc_sensor rk_t * pull out of here? * do something with hysteresis? put in debounce? * - * Note that tshut may be overriden by the board specific DT. + * Note that tshut may be overridden by the board specific DT. */ .s_warn = 75000000, .s_tshut = 95000000, Index: src/sys/arch/cesfic/dev/zs.c diff -u src/sys/arch/cesfic/dev/zs.c:1.23 src/sys/arch/cesfic/dev/zs.c:1.24 --- src/sys/arch/cesfic/dev/zs.c:1.23 Sat Aug 7 16:18:47 2021 +++ src/sys/arch/cesfic/dev/zs.c Sat Sep 11 20:28:03 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.23 2021/08/07 16:18:47 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.24 2021/09/11 20:28:03 andvar Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.23 2021/08/07 16:18:47 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.24 2021/09/11 20:28:03 andvar Exp $"); #include "opt_ddb.h" @@ -298,7 +298,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/arch/cobalt/dev/zs.c diff -u src/sys/arch/cobalt/dev/zs.c:1.6 src/sys/arch/cobalt/dev/zs.c:1.7 --- src/sys/arch/cobalt/dev/zs.c:1.6 Sat Aug 7 16:18:47 2021 +++ src/sys/arch/cobalt/dev/zs.c Sat Sep 11 20:28:03 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.6 2021/08/07 16:18:47 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.7 2021/09/11 20:28:03 andvar Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.6 2021/08/07 16:18:47 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.7 2021/09/11 20:28:03 andvar Exp $"); #include "opt_ddb.h" @@ -346,7 +346,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/arch/ews4800mips/dev/zs.c diff -u src/sys/arch/ews4800mips/dev/zs.c:1.5 src/sys/arch/ews4800mips/dev/zs.c:1.6 --- src/sys/arch/ews4800mips/dev/zs.c:1.5 Mon Apr 28 20:23:18 2008 +++ src/sys/arch/ews4800mips/dev/zs.c Sat Sep 11 20:28:03 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.5 2008/04/28 20:23:18 martin Exp $ */ +/* $NetBSD: zs.c,v 1.6 2021/09/11 20:28:03 andvar Exp $ */ /*- * Copyright (c) 1996, 2005 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.5 2008/04/28 20:23:18 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.6 2021/09/11 20:28:03 andvar Exp $"); #include "opt_ddb.h" @@ -147,7 +147,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/arch/mac68k/dev/zs.c diff -u src/sys/arch/mac68k/dev/zs.c:1.60 src/sys/arch/mac68k/dev/zs.c:1.61 --- src/sys/arch/mac68k/dev/zs.c:1.60 Sat Aug 7 16:18:57 2021 +++ src/sys/arch/mac68k/dev/zs.c Sat Sep 11 20:28:04 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.60 2021/08/07 16:18:57 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.61 2021/09/11 20:28:04 andvar Exp $ */ /* * Copyright (c) 1996-1998 Bill Studenmund @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.60 2021/08/07 16:18:57 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.61 2021/09/11 20:28:04 andvar Exp $"); #include "opt_ddb.h" #include "opt_mac68k.h" @@ -514,7 +514,7 @@ zs_set_speed(struct zs_chanstate *cs, in * Step through all the sources and see which one matches * the best. A source has to match BETTER than tol to be chosen. * Thus if two sources give the same error, the first one will be - * chosen. Also, allow for the possability that one source might run + * chosen. Also, allow for the possibility that one source might run * both the BRG and the direct divider (i.e. RTxC). */ for (i=0; i < xcs->cs_clock_count; i++) { @@ -645,7 +645,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Make sure we don't enable hfc on a signal line we're ignoring. * As we enable CTS interrupts only if we have CRTSCTS or CDTRCTS, - * this code also effectivly turns off ZSWR15_CTS_IE. + * this code also effectively turns off ZSWR15_CTS_IE. * * Also, disable DCD interrupts if we've been told to ignore * the DCD pin. Happens on mac68k because the input line for @@ -676,7 +676,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ @@ -806,7 +806,7 @@ static void zscnsetup(void); */ /* - * This code modled after the zs_setparam routine in zskgdb + * This code modeled after the zs_setparam routine in zskgdb * It sets the console unit to a known state so we can output * correctly. */ @@ -907,7 +907,7 @@ zscnprobe(struct consdev * cp) * chip for console I/O, we just set up the internal addresses for it. * * Now turn off interrupts for the chip. Note: using sccA to get at - * the chip is the only vestage of the NetBSD 1.0 ser driver. :-) + * the chip is the only vestige of the NetBSD 1.0 ser driver. :-) */ unit = sccA[2]; /* reset reg. access */ unit = sccA[0]; Index: src/sys/arch/macppc/dev/zs.c diff -u src/sys/arch/macppc/dev/zs.c:1.53 src/sys/arch/macppc/dev/zs.c:1.54 --- src/sys/arch/macppc/dev/zs.c:1.53 Sat Aug 7 16:18:58 2021 +++ src/sys/arch/macppc/dev/zs.c Sat Sep 11 20:28:04 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.53 2021/08/07 16:18:58 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.54 2021/09/11 20:28:04 andvar Exp $ */ /* * Copyright (c) 1996, 1998 Bill Studenmund @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.53 2021/08/07 16:18:58 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.54 2021/09/11 20:28:04 andvar Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -554,7 +554,7 @@ zs_set_speed(struct zs_chanstate *cs, in * Step through all the sources and see which one matches * the best. A source has to match BETTER than tol to be chosen. * Thus if two sources give the same error, the first one will be - * chosen. Also, allow for the possability that one source might run + * chosen. Also, allow for the possibility that one source might run * both the BRG and the direct divider (i.e. RTxC). */ for (i = 0; i < xcs->cs_clock_count; i++) { @@ -685,7 +685,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Make sure we don't enable hfc on a signal line we're ignoring. * As we enable CTS interrupts only if we have CRTSCTS or CDTRCTS, - * this code also effectivly turns off ZSWR15_CTS_IE. + * this code also effectively turns off ZSWR15_CTS_IE. * * Also, disable DCD interrupts if we've been told to ignore * the DCD pin. Happens on mac68k because the input line for @@ -707,7 +707,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/arch/mipsco/obio/zs.c diff -u src/sys/arch/mipsco/obio/zs.c:1.27 src/sys/arch/mipsco/obio/zs.c:1.28 --- src/sys/arch/mipsco/obio/zs.c:1.27 Sat Aug 7 16:19:00 2021 +++ src/sys/arch/mipsco/obio/zs.c Sat Sep 11 20:28:04 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.27 2021/08/07 16:19:00 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.28 2021/09/11 20:28:04 andvar Exp $ */ /*- * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.27 2021/08/07 16:19:00 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.28 2021/09/11 20:28:04 andvar Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -441,7 +441,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/arch/mvme68k/dev/zs.c diff -u src/sys/arch/mvme68k/dev/zs.c:1.44 src/sys/arch/mvme68k/dev/zs.c:1.45 --- src/sys/arch/mvme68k/dev/zs.c:1.44 Sat Aug 7 16:19:00 2021 +++ src/sys/arch/mvme68k/dev/zs.c Sat Sep 11 20:28:04 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.44 2021/08/07 16:19:00 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.45 2021/09/11 20:28:04 andvar Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.44 2021/08/07 16:19:00 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.45 2021/09/11 20:28:04 andvar Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -335,7 +335,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/arch/news68k/dev/zs.c diff -u src/sys/arch/news68k/dev/zs.c:1.33 src/sys/arch/news68k/dev/zs.c:1.34 --- src/sys/arch/news68k/dev/zs.c:1.33 Sat Aug 7 16:19:00 2021 +++ src/sys/arch/news68k/dev/zs.c Sat Sep 11 20:28:04 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.33 2021/08/07 16:19:00 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.34 2021/09/11 20:28:04 andvar Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.33 2021/08/07 16:19:00 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.34 2021/09/11 20:28:04 andvar Exp $"); #include "opt_ddb.h" @@ -377,7 +377,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/arch/newsmips/dev/zs.c diff -u src/sys/arch/newsmips/dev/zs.c:1.27 src/sys/arch/newsmips/dev/zs.c:1.28 --- src/sys/arch/newsmips/dev/zs.c:1.27 Sat Jul 28 23:08:57 2012 +++ src/sys/arch/newsmips/dev/zs.c Sat Sep 11 20:28:04 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.27 2012/07/28 23:08:57 matt Exp $ */ +/* $NetBSD: zs.c,v 1.28 2021/09/11 20:28:04 andvar Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.27 2012/07/28 23:08:57 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.28 2021/09/11 20:28:04 andvar Exp $"); #include "opt_ddb.h" @@ -154,7 +154,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/arch/next68k/dev/zs.c diff -u src/sys/arch/next68k/dev/zs.c:1.36 src/sys/arch/next68k/dev/zs.c:1.37 --- src/sys/arch/next68k/dev/zs.c:1.36 Sat Aug 7 16:19:01 2021 +++ src/sys/arch/next68k/dev/zs.c Sat Sep 11 20:28:04 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.36 2021/08/07 16:19:01 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.37 2021/09/11 20:28:04 andvar Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.36 2021/08/07 16:19:01 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.37 2021/09/11 20:28:04 andvar Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -389,7 +389,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/arch/powerpc/booke/e500_intr.c diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.44 src/sys/arch/powerpc/booke/e500_intr.c:1.45 --- src/sys/arch/powerpc/booke/e500_intr.c:1.44 Mon Jul 6 10:11:14 2020 +++ src/sys/arch/powerpc/booke/e500_intr.c Sat Sep 11 20:28:04 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: e500_intr.c,v 1.44 2020/07/06 10:11:14 rin Exp $ */ +/* $NetBSD: e500_intr.c,v 1.45 2021/09/11 20:28:04 andvar Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -37,7 +37,7 @@ #define __INTR_PRIVATE #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.44 2020/07/06 10:11:14 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.45 2021/09/11 20:28:04 andvar Exp $"); #ifdef _KERNEL_OPT #include "opt_mpc85xx.h" @@ -1001,7 +1001,7 @@ e500_extintr(struct trapframe *tf) struct intr_source * const is = &e500_intr_sources[irq]; if (__predict_true(is < e500_intr_last_source)) { /* - * Timer interrupts get their argument overriden with + * Timer interrupts get their argument overridden with * the pointer to the trapframe. */ KASSERTMSG(is->is_ipl == ipl, Index: src/sys/arch/powerpc/include/booke/vmparam.h diff -u src/sys/arch/powerpc/include/booke/vmparam.h:1.9 src/sys/arch/powerpc/include/booke/vmparam.h:1.10 --- src/sys/arch/powerpc/include/booke/vmparam.h:1.9 Sat Apr 17 13:25:57 2021 +++ src/sys/arch/powerpc/include/booke/vmparam.h Sat Sep 11 20:28:04 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.9 2021/04/17 13:25:57 rin Exp $ */ +/* $NetBSD: vmparam.h,v 1.10 2021/09/11 20:28:04 andvar Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -38,7 +38,7 @@ #define _POWERPC_BOOKE_VMPARAM_H_ /* - * Most of the definitions in this can be overriden by a machine-specific + * Most of the definitions in this can be overridden by a machine-specific * vmparam.h if required. Otherwise a port can just include this file * get the right thing to happen. */ Index: src/sys/arch/powerpc/include/oea/vmparam.h diff -u src/sys/arch/powerpc/include/oea/vmparam.h:1.21 src/sys/arch/powerpc/include/oea/vmparam.h:1.22 --- src/sys/arch/powerpc/include/oea/vmparam.h:1.21 Sat Apr 17 09:22:28 2021 +++ src/sys/arch/powerpc/include/oea/vmparam.h Sat Sep 11 20:28:05 2021 @@ -33,7 +33,7 @@ #include <sys/queue.h> /* - * Most of the definitions in this can be overriden by a machine-specific + * Most of the definitions in this can be overridden by a machine-specific * vmparam.h if required. Otherwise a port can just include this file * get the right thing to happen. */ Index: src/sys/arch/sgimips/dev/zs.c diff -u src/sys/arch/sgimips/dev/zs.c:1.41 src/sys/arch/sgimips/dev/zs.c:1.42 --- src/sys/arch/sgimips/dev/zs.c:1.41 Sat Aug 7 16:19:04 2021 +++ src/sys/arch/sgimips/dev/zs.c Sat Sep 11 20:28:05 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.41 2021/08/07 16:19:04 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.42 2021/09/11 20:28:05 andvar Exp $ */ /*- * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.41 2021/08/07 16:19:04 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.42 2021/09/11 20:28:05 andvar Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -489,7 +489,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/arch/sparc/dev/sx.c diff -u src/sys/arch/sparc/dev/sx.c:1.4 src/sys/arch/sparc/dev/sx.c:1.5 --- src/sys/arch/sparc/dev/sx.c:1.4 Fri Mar 1 02:30:42 2019 +++ src/sys/arch/sparc/dev/sx.c Sat Sep 11 20:28:05 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sx.c,v 1.4 2019/03/01 02:30:42 macallan Exp $ */ +/* $NetBSD: sx.c,v 1.5 2021/09/11 20:28:05 andvar Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sx.c,v 1.4 2019/03/01 02:30:42 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sx.c,v 1.5 2021/09/11 20:28:05 andvar Exp $"); #include "locators.h" @@ -100,7 +100,7 @@ sx_attach(device_t parent, device_t self /* initialize control registers, clear errors etc. */ sx_write(sc, SX_R0_INIT, 0); sx_write(sc, SX_ERROR, 0); - /* default, to be overriden once cgfourteen takes over */ + /* default, to be overridden once cgfourteen takes over */ sx_write(sc, SX_PAGE_BOUND_LOWER, 0xfc000000); /* cg14 takes up the whole 64MB chunk */ sx_write(sc, SX_PAGE_BOUND_UPPER, 0xffffffff); Index: src/sys/arch/sparc/dev/zs.c diff -u src/sys/arch/sparc/dev/zs.c:1.123 src/sys/arch/sparc/dev/zs.c:1.124 --- src/sys/arch/sparc/dev/zs.c:1.123 Sat Aug 7 16:19:05 2021 +++ src/sys/arch/sparc/dev/zs.c Sat Sep 11 20:28:05 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.123 2021/08/07 16:19:05 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.124 2021/09/11 20:28:05 andvar Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.123 2021/08/07 16:19:05 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.124 2021/09/11 20:28:05 andvar Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -687,7 +687,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/arch/sparc64/dev/zs.c diff -u src/sys/arch/sparc64/dev/zs.c:1.77 src/sys/arch/sparc64/dev/zs.c:1.78 --- src/sys/arch/sparc64/dev/zs.c:1.77 Sat Aug 7 16:19:05 2021 +++ src/sys/arch/sparc64/dev/zs.c Sat Sep 11 20:28:05 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.77 2021/08/07 16:19:05 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.78 2021/09/11 20:28:05 andvar Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.77 2021/08/07 16:19:05 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.78 2021/09/11 20:28:05 andvar Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -615,7 +615,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/arch/sun2/dev/zs.c diff -u src/sys/arch/sun2/dev/zs.c:1.23 src/sys/arch/sun2/dev/zs.c:1.24 --- src/sys/arch/sun2/dev/zs.c:1.23 Sat Aug 7 16:19:06 2021 +++ src/sys/arch/sun2/dev/zs.c Sat Sep 11 20:28:05 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.23 2021/08/07 16:19:06 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.24 2021/09/11 20:28:05 andvar Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.23 2021/08/07 16:19:06 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.24 2021/09/11 20:28:05 andvar Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -453,7 +453,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/arch/sun3/dev/zs.c diff -u src/sys/arch/sun3/dev/zs.c:1.90 src/sys/arch/sun3/dev/zs.c:1.91 --- src/sys/arch/sun3/dev/zs.c:1.90 Sat Aug 7 16:19:06 2021 +++ src/sys/arch/sun3/dev/zs.c Sat Sep 11 20:28:05 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.90 2021/08/07 16:19:06 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.91 2021/09/11 20:28:05 andvar Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.90 2021/08/07 16:19:06 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.91 2021/09/11 20:28:05 andvar Exp $"); #include "opt_kgdb.h" @@ -447,7 +447,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/arch/x68k/dev/zs.c diff -u src/sys/arch/x68k/dev/zs.c:1.46 src/sys/arch/x68k/dev/zs.c:1.47 --- src/sys/arch/x68k/dev/zs.c:1.46 Sat Aug 7 16:19:07 2021 +++ src/sys/arch/x68k/dev/zs.c Sat Sep 11 20:28:05 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.46 2021/08/07 16:19:07 thorpej Exp $ */ +/* $NetBSD: zs.c,v 1.47 2021/09/11 20:28:05 andvar Exp $ */ /*- * Copyright (c) 1998 Minoura Makoto @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.46 2021/08/07 16:19:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.47 2021/09/11 20:28:05 andvar Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -397,7 +397,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/sys/conf/Makefile.kern.inc diff -u src/sys/conf/Makefile.kern.inc:1.281 src/sys/conf/Makefile.kern.inc:1.282 --- src/sys/conf/Makefile.kern.inc:1.281 Wed Jun 2 15:45:28 2021 +++ src/sys/conf/Makefile.kern.inc Sat Sep 11 20:28:05 2021 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.kern.inc,v 1.281 2021/06/02 15:45:28 nia Exp $ +# $NetBSD: Makefile.kern.inc,v 1.282 2021/09/11 20:28:05 andvar Exp $ # # This file contains common `MI' targets and definitions and it is included # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}. # # Each target in this file should be protected with `if !target(target)' # or `if !commands(target)' and each variable should only be conditionally -# assigned `VAR ?= VALUE', so that everything can be overriden. +# assigned `VAR ?= VALUE', so that everything can be overridden. # # DEBUG is set to -g if debugging. # PROF is set to -pg if profiling. @@ -414,7 +414,7 @@ ${_s:T:R}.d: ${_s} # List of kernel images that will be installed into the root file system. # Some platforms may need to install more than one (e.g. a netbsd.aout file -# to be loaded directly by the firmware), so this can be overriden by them. +# to be loaded directly by the firmware), so this can be overridden by them. KERNIMAGES?= netbsd .if !target(install) Index: src/sys/dev/mm.h diff -u src/sys/dev/mm.h:1.3 src/sys/dev/mm.h:1.4 --- src/sys/dev/mm.h:1.3 Mon Jul 11 16:13:28 2016 +++ src/sys/dev/mm.h Sat Sep 11 20:28:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mm.h,v 1.3 2016/07/11 16:13:28 matt Exp $ */ +/* $NetBSD: mm.h,v 1.4 2021/09/11 20:28:06 andvar Exp $ */ /*- * Copyright (c) 2008 Joerg Sonnenberger <jo...@netbsd.org>. @@ -64,7 +64,7 @@ paddr_t mm_md_mmap(dev_t, off_t, int); /* * Optional access check for the virtual address. The third argument tells - * mm that the check was done and uvm_kernacc is overriden. + * mm that the check was done and uvm_kernacc is overridden. * * machine/types.h must define __HAVE_MM_MD_KERNACC to use this. */ Index: src/sys/dev/ic/dm9000.c diff -u src/sys/dev/ic/dm9000.c:1.29 src/sys/dev/ic/dm9000.c:1.30 --- src/sys/dev/ic/dm9000.c:1.29 Sat Jun 27 13:34:20 2020 +++ src/sys/dev/ic/dm9000.c Sat Sep 11 20:28:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: dm9000.c,v 1.29 2020/06/27 13:34:20 jmcneill Exp $ */ +/* $NetBSD: dm9000.c,v 1.30 2021/09/11 20:28:06 andvar Exp $ */ /* * Copyright (c) 2009 Paul Fleischer @@ -219,7 +219,7 @@ dme_attach(struct dme_softc *sc, const u ea = (dict) ? prop_dictionary_get(dict, "mac-address") : NULL; if (ea != NULL) { /* - * If the MAC address is overriden by a device property, + * If the MAC address is overridden by a device property, * use that. */ KASSERT(prop_object_type(ea) == PROP_TYPE_DATA); Index: src/sys/dev/ic/dwc_gmac.c diff -u src/sys/dev/ic/dwc_gmac.c:1.74 src/sys/dev/ic/dwc_gmac.c:1.75 --- src/sys/dev/ic/dwc_gmac.c:1.74 Wed Jun 16 00:21:18 2021 +++ src/sys/dev/ic/dwc_gmac.c Sat Sep 11 20:28:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_gmac.c,v 1.74 2021/06/16 00:21:18 riastradh Exp $ */ +/* $NetBSD: dwc_gmac.c,v 1.75 2021/09/11 20:28:06 andvar Exp $ */ /*- * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.74 2021/06/16 00:21:18 riastradh Exp $"); +__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.75 2021/09/11 20:28:06 andvar Exp $"); /* #define DWC_GMAC_DEBUG 1 */ @@ -196,7 +196,7 @@ dwc_gmac_attach(struct dwc_gmac_softc *s prop_data_t ea = dict ? prop_dictionary_get(dict, "mac-address") : NULL; if (ea != NULL) { /* - * If the MAC address is overriden by a device property, + * If the MAC address is overridden by a device property, * use that. */ KASSERT(prop_object_type(ea) == PROP_TYPE_DATA); Index: src/sys/dev/ic/isp.c diff -u src/sys/dev/ic/isp.c:1.128 src/sys/dev/ic/isp.c:1.129 --- src/sys/dev/ic/isp.c:1.128 Mon Sep 6 21:56:04 2021 +++ src/sys/dev/ic/isp.c Sat Sep 11 20:28:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: isp.c,v 1.128 2021/09/06 21:56:04 andvar Exp $ */ +/* $NetBSD: isp.c,v 1.129 2021/09/11 20:28:06 andvar Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -43,7 +43,7 @@ */ #ifdef __NetBSD__ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.128 2021/09/06 21:56:04 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.129 2021/09/11 20:28:06 andvar Exp $"); #include <dev/ic/isp_netbsd.h> #endif #ifdef __FreeBSD__ @@ -1143,7 +1143,7 @@ isp_reset(ispsoftc_t *isp, int do_load_d /* * We get some default values established. As a side - * effect, NVRAM is read here (unless overriden by + * effect, NVRAM is read here (unless overridden by * a configuration flag). */ if (do_load_defaults) { Index: src/sys/dev/ic/ispvar.h diff -u src/sys/dev/ic/ispvar.h:1.73 src/sys/dev/ic/ispvar.h:1.74 --- src/sys/dev/ic/ispvar.h:1.73 Sat Oct 18 08:33:27 2014 +++ src/sys/dev/ic/ispvar.h Sat Sep 11 20:28:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ispvar.h,v 1.73 2014/10/18 08:33:27 snj Exp $ */ +/* $NetBSD: ispvar.h,v 1.74 2021/09/11 20:28:06 andvar Exp $ */ /* * Copyright (C) 1999 National Aeronautics & Space Administration * All rights reserved. @@ -1117,7 +1117,7 @@ void isp_async(ispsoftc_t *, ispasync_t, * DEFAULT_PORTWWN(ispsoftc_t *, chan) Default FC Port WWN to use * * These defines are hooks to allow the setting of node and - * port WWNs when NVRAM cannot be read or is to be overriden. + * port WWNs when NVRAM cannot be read or is to be overridden. * * ACTIVE_NODEWWN(ispsoftc_t *, chan) FC Node WWN to use * ACTIVE_PORTWWN(ispsoftc_t *, chan) FC Port WWN to use Index: src/sys/dev/tc/zs_ioasic.c diff -u src/sys/dev/tc/zs_ioasic.c:1.43 src/sys/dev/tc/zs_ioasic.c:1.44 --- src/sys/dev/tc/zs_ioasic.c:1.43 Sat Aug 7 16:19:16 2021 +++ src/sys/dev/tc/zs_ioasic.c Sat Sep 11 20:28:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: zs_ioasic.c,v 1.43 2021/08/07 16:19:16 thorpej Exp $ */ +/* $NetBSD: zs_ioasic.c,v 1.44 2021/09/11 20:28:06 andvar Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.43 2021/08/07 16:19:16 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.44 2021/09/11 20:28:06 andvar Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -487,7 +487,7 @@ zs_set_modes(struct zs_chanstate *cs, in /* * Output hardware flow control on the chip is horrendous: * if carrier detect drops, the receiver is disabled, and if - * CTS drops, the transmitter is stoped IN MID CHARACTER! + * CTS drops, the transmitter is stopped IN MID CHARACTER! * Therefore, NEVER set the HFC bit, and instead use the * status interrupt to detect CTS changes. */ Index: src/tests/usr.bin/patch/t_patch.sh diff -u src/tests/usr.bin/patch/t_patch.sh:1.3 src/tests/usr.bin/patch/t_patch.sh:1.4 --- src/tests/usr.bin/patch/t_patch.sh:1.3 Tue May 25 11:55:42 2021 +++ src/tests/usr.bin/patch/t_patch.sh Sat Sep 11 20:28:06 2021 @@ -1,4 +1,4 @@ -# $NetBSD: t_patch.sh,v 1.3 2021/05/25 11:55:42 cjep Exp $ +# $NetBSD: t_patch.sh,v 1.4 2021/09/11 20:28:06 andvar Exp $ # # Copyright (c) 2020, 2021 The NetBSD Foundation, Inc. # All rights reserved. @@ -120,7 +120,7 @@ EOF atf_check [ ! -f to_patch.orig ] atf_check grep -q -m 1 '^new text$' to_patch - # Environment variables should be overriden. + # Environment variables should be overridden. printf '%s\n' 'original file' > to_patch VERSION_CONTROL=existing patch -V none to_patch \ < test_diff.patch Index: src/usr.bin/config/config.5 diff -u src/usr.bin/config/config.5:1.45 src/usr.bin/config/config.5:1.46 --- src/usr.bin/config/config.5:1.45 Tue Sep 29 03:02:19 2020 +++ src/usr.bin/config/config.5 Sat Sep 11 20:28:06 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: config.5,v 1.45 2020/09/29 03:02:19 msaitoh Exp $ +.\" $NetBSD: config.5,v 1.46 2021/09/11 20:28:06 andvar Exp $ .\" .\" Copyright (c) 2006, 2007 The NetBSD Foundation. .\" All rights reserved. @@ -880,7 +880,7 @@ Removes support for the specified pseudo Ns Op Ic \&, Ar ... Adds or appends to a definition in the generated .Pa Makefile . -A definition cannot be overriden, it must be removed before it can be added +A definition cannot be overridden, it must be removed before it can be added again. Optionally, if an option .Li makeoptions_ Ns Aq Ar name Index: src/usr.bin/kdump/mksiginfos diff -u src/usr.bin/kdump/mksiginfos:1.5 src/usr.bin/kdump/mksiginfos:1.6 --- src/usr.bin/kdump/mksiginfos:1.5 Sun Oct 19 22:10:05 2008 +++ src/usr.bin/kdump/mksiginfos Sat Sep 11 20:28:06 2021 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: mksiginfos,v 1.5 2008/10/19 22:10:05 apb Exp $ +# $NetBSD: mksiginfos,v 1.6 2021/09/11 20:28:06 andvar Exp $ # # Copyright (c) 2003 The NetBSD Foundation, Inc. # All rights reserved. @@ -28,7 +28,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -# allow AWK to be overriden +# allow AWK to be overridden : ${AWK:=awk} $AWK ' Index: src/usr.bin/tip/acu.c diff -u src/usr.bin/tip/acu.c:1.17 src/usr.bin/tip/acu.c:1.18 --- src/usr.bin/tip/acu.c:1.17 Fri Feb 1 08:29:04 2019 +++ src/usr.bin/tip/acu.c Sat Sep 11 20:28:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: acu.c,v 1.17 2019/02/01 08:29:04 mrg Exp $ */ +/* $NetBSD: acu.c,v 1.18 2021/09/11 20:28:06 andvar Exp $ */ /* * Copyright (c) 1983, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)acu.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: acu.c,v 1.17 2019/02/01 08:29:04 mrg Exp $"); +__RCSID("$NetBSD: acu.c,v 1.18 2021/09/11 20:28:06 andvar Exp $"); #endif /* not lint */ #include "tip.h" @@ -53,7 +53,7 @@ static acu_t *acutype(char *); * The phone numbers are in PN, and the call unit is in CU. * * If the PN is an '@', then we consult the PHONES file for - * the phone numbers. This file is /etc/phones, unless overriden + * the phone numbers. This file is /etc/phones, unless overridden. * by an exported shell variable. * * The data base files must be in the format: Index: src/usr.sbin/sysinst/README.md_defs diff -u src/usr.sbin/sysinst/README.md_defs:1.6 src/usr.sbin/sysinst/README.md_defs:1.7 --- src/usr.sbin/sysinst/README.md_defs:1.6 Mon Oct 5 12:28:45 2020 +++ src/usr.sbin/sysinst/README.md_defs Sat Sep 11 20:28:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: README.md_defs,v 1.6 2020/10/05 12:28:45 martin Exp $ */ +/* $NetBSD: README.md_defs,v 1.7 2021/09/11 20:28:06 andvar Exp $ */ The following is trying to document the most important machine dependent defines used in the sysinst code. @@ -14,7 +14,7 @@ copied at 8k into the image). The default installation description is created as a static array using -lots of conditionals. It may be overriden / replaced in the MD code +lots of conditionals. It may be overridden / replaced in the MD code (see below), an example for that is arch/i386/md.c when we have been booted from UEFI firmware. Index: src/usr.sbin/sysinst/partitions.c diff -u src/usr.sbin/sysinst/partitions.c:1.12 src/usr.sbin/sysinst/partitions.c:1.13 --- src/usr.sbin/sysinst/partitions.c:1.12 Fri Nov 6 12:23:10 2020 +++ src/usr.sbin/sysinst/partitions.c Sat Sep 11 20:28:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: partitions.c,v 1.12 2020/11/06 12:23:10 martin Exp $ */ +/* $NetBSD: partitions.c,v 1.13 2021/09/11 20:28:06 andvar Exp $ */ /* * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -136,7 +136,7 @@ extern const struct disk_partitioning_sc static struct disk_partitioning_scheme only_disklabel_parts; /* - * If not overriden by MD code, we can not boot from plain + * If not overridden by MD code, we can not boot from plain * disklabel disks (w/o MBR). */ static bool have_only_disklabel_boot_support(const char *disk) Index: src/usr.sbin/sysinst/partitions.h diff -u src/usr.sbin/sysinst/partitions.h:1.22 src/usr.sbin/sysinst/partitions.h:1.23 --- src/usr.sbin/sysinst/partitions.h:1.22 Sun Jan 31 22:45:46 2021 +++ src/usr.sbin/sysinst/partitions.h Sat Sep 11 20:28:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: partitions.h,v 1.22 2021/01/31 22:45:46 rillig Exp $ */ +/* $NetBSD: partitions.h,v 1.23 2021/09/11 20:28:06 andvar Exp $ */ /* * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -618,7 +618,7 @@ partitions_read_disk(const char *, daddr size_t bytes_per_sector, bool no_mbr); /* - * Generic part info adaption, may be overriden by individual partitionin + * Generic part info adaption, may be overridden by individual partitioning * schemes */ bool generic_adapt_foreign_part_info(