diff --git a/common/lib/libprop/prop_array.c b/common/lib/libprop/prop_array.c index c73996fb25d4..2b6108b63ab3 100644 --- a/common/lib/libprop/prop_array.c +++ b/common/lib/libprop/prop_array.c @@ -1,4 +1,4 @@ -/* $NetBSD: prop_array.c,v 1.21 2012/07/27 09:10:59 pooka Exp $ */ +/* $NetBSD: prop_array.c,v 1.22 2023/03/26 19:10:32 andvar Exp $ */ /*- * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. @@ -488,7 +488,7 @@ prop_array_count(prop_array_t pa) /* * prop_array_ensure_capacity -- * Ensure that the array has the capacity to store the specified - * total number of objects (inluding the objects already stored + * total number of objects (including the objects already stored * in the array). */ bool diff --git a/common/lib/libprop/prop_array_util.3 b/common/lib/libprop/prop_array_util.3 index 3a2cdcf9ee26..79a25a15376f 100644 --- a/common/lib/libprop/prop_array_util.3 +++ b/common/lib/libprop/prop_array_util.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: prop_array_util.3,v 1.11 2020/06/06 21:25:59 thorpej Exp $ +.\" $NetBSD: prop_array_util.3,v 1.12 2023/03/26 19:10:32 andvar Exp $ .\" .\" Copyright (c) 2006, 2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -357,7 +357,7 @@ and do not copy the data that is set or returned. See .Xr prop_data 3 -for more informtaion. +for more information. .Pp The .Fn prop_array_get_string , diff --git a/doc/BRANCHES b/doc/BRANCHES index 740d56b86bb4..0e0c2eef3ff2 100644 --- a/doc/BRANCHES +++ b/doc/BRANCHES @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.366 2022/12/16 17:35:42 martin Exp $ +# $NetBSD: BRANCHES,v 1.367 2023/03/26 19:10:32 andvar Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -764,7 +764,7 @@ End Date: Sun Aug 19 2021 Base Tag: thorpej-futex-base Maintainer: Jason Thorpe Scope: src/sys src/tests/lib/libc/sys src/distrib/sets/lists -Notes: Normal futex operataions pass the test suite, but there are +Notes: Normal futex operations pass the test suite, but there are issues with Linux compatibility currently, that need to be addressed before merging. Also includes new NetBSD extensions to the futex interface to support reader/writer locks. Those diff --git a/sys/arch/arm/rockchip/rk3399_pcie.c b/sys/arch/arm/rockchip/rk3399_pcie.c index f8318eea806e..f65e7cc73c1e 100644 --- a/sys/arch/arm/rockchip/rk3399_pcie.c +++ b/sys/arch/arm/rockchip/rk3399_pcie.c @@ -1,4 +1,4 @@ -/* $NetBSD: rk3399_pcie.c,v 1.19 2022/10/15 11:07:39 jmcneill Exp $ */ +/* $NetBSD: rk3399_pcie.c,v 1.20 2023/03/26 19:10:33 andvar Exp $ */ /* * Copyright (c) 2018 Mark Kettenis * @@ -17,7 +17,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.19 2022/10/15 11:07:39 jmcneill Exp $"); +__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.20 2023/03/26 19:10:33 andvar Exp $"); #include #include @@ -261,7 +261,7 @@ rkpcie_attach(device_t parent, device_t self, void *aux) * what these errata involved (not public), but posts from the * @rock-chips.com domain to u-boot and linux-kernel lists indicate * that there is a errata related to this, and indeed, the Datasheet - * since at least Rev 1.6 and inluding the latest Rev 1.8 say that the + * since at least Rev 1.6 and including the latest Rev 1.8 say that the * PCIe can handle 2.5GT/s (ie, PCIe 1.x). */ if (of_getprop_uint32(phandle, "max-link-speed", &max_link_speed) != 0) diff --git a/sys/arch/hppa/include/pdc.h b/sys/arch/hppa/include/pdc.h index c8b97f4cc75c..6c3c48f305a5 100644 --- a/sys/arch/hppa/include/pdc.h +++ b/sys/arch/hppa/include/pdc.h @@ -1,4 +1,4 @@ -/* $NetBSD: pdc.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */ +/* $NetBSD: pdc.h,v 1.2 2023/03/26 19:10:33 andvar Exp $ */ /* $OpenBSD: pdc.h,v 1.35 2007/07/15 20:03:48 kettenis Exp $ */ @@ -210,7 +210,7 @@ #define PDC_CONF 17 /* (de)configure a module */ #define PDC_CONF_DECONF 0 /* deconfigure module */ #define PDC_CONF_RECONF 1 /* reconfigure module */ -#define PDC_CONF_INFO 2 /* get config informaion */ +#define PDC_CONF_INFO 2 /* get config information */ #define PDC_BLOCK_TLB 18 /* Manage Block TLB entries (BTLB) */ #define PDC_BTLB_DEFAULT 0 /* Return BTLB configuration info */ diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c index 3d1b74b3843d..ea124c936809 100644 --- a/sys/arch/mvme68k/mvme68k/machdep.c +++ b/sys/arch/mvme68k/mvme68k/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.159 2021/10/09 20:00:41 tsutsui Exp $ */ +/* $NetBSD: machdep.c,v 1.160 2023/03/26 19:10:33 andvar Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.159 2021/10/09 20:00:41 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.160 2023/03/26 19:10:33 andvar Exp $"); #include "opt_ddb.h" #include "opt_m060sp.h" @@ -326,7 +326,7 @@ mvme147_init(void) int get_cpuspeed(void); /* - * MVME-1[67]x specific initializaion. + * MVME-1[67]x specific initialization. */ void mvme1xx_init(void) diff --git a/sys/arch/playstation2/include/kloader.h b/sys/arch/playstation2/include/kloader.h index 763057ed04a2..e73009839d51 100644 --- a/sys/arch/playstation2/include/kloader.h +++ b/sys/arch/playstation2/include/kloader.h @@ -1,4 +1,4 @@ -/* $NetBSD: kloader.h,v 1.7 2020/09/06 17:19:47 riastradh Exp $ */ +/* $NetBSD: kloader.h,v 1.8 2023/03/26 19:10:33 andvar Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ #include -/* Playstaion 2 port kloader don't need bootinfo */ +/* Playstation 2 port kloader don't need bootinfo */ #define KLOADER_NO_BOOTINFO #define PG_VADDR(pg) MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(pg)) #include diff --git a/sys/dev/pci/cxgb/cxgb_xgmac.c b/sys/dev/pci/cxgb/cxgb_xgmac.c index 62f1e11a2e9b..35ab362d34d5 100644 --- a/sys/dev/pci/cxgb/cxgb_xgmac.c +++ b/sys/dev/pci/cxgb/cxgb_xgmac.c @@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ #include -__KERNEL_RCSID(0, "$NetBSD: cxgb_xgmac.c,v 1.2 2018/09/03 16:29:32 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cxgb_xgmac.c,v 1.3 2023/03/26 19:10:33 andvar Exp $"); #ifdef CONFIG_DEFINED #include @@ -351,7 +351,7 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu) adapter_t *adap = mac->adapter; /* - * MAX_FRAME_SIZE inludes header + FCS, mtu doesn't. The HW max + * MAX_FRAME_SIZE includes header + FCS, mtu doesn't. The HW max * packet size register includes header, but not FCS. */ mtu += 14; diff --git a/sys/dev/pci/if_ixl.c b/sys/dev/pci/if_ixl.c index 367817767bff..41f84685e66a 100644 --- a/sys/dev/pci/if_ixl.c +++ b/sys/dev/pci/if_ixl.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ixl.c,v 1.88 2022/09/16 03:12:03 knakahara Exp $ */ +/* $NetBSD: if_ixl.c,v 1.89 2023/03/26 19:10:33 andvar Exp $ */ /* * Copyright (c) 2013-2015, Intel Corporation @@ -74,7 +74,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.88 2022/09/16 03:12:03 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.89 2023/03/26 19:10:33 andvar Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -6663,7 +6663,7 @@ ixl_sysctl_itr_handler(SYSCTLFN_ARGS) if (error || newp == NULL) return error; - /* ITRs are applied in ixl_init() for simple implementaion */ + /* ITRs are applied in ixl_init() for simple implementation */ if (ISSET(ifp->if_flags, IFF_RUNNING)) return EBUSY; diff --git a/sys/net/agr/if_agrvar_impl.h b/sys/net/agr/if_agrvar_impl.h index 652c6f965c5c..4399a15b656a 100644 --- a/sys/net/agr/if_agrvar_impl.h +++ b/sys/net/agr/if_agrvar_impl.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_agrvar_impl.h,v 1.11 2017/01/28 22:56:09 maya Exp $ */ +/* $NetBSD: if_agrvar_impl.h,v 1.12 2023/03/26 19:10:33 andvar Exp $ */ /*- * Copyright (c)2005 YAMAMOTO Takashi, @@ -30,7 +30,7 @@ #define _NET_AGR_IF_AGRVAR_IMPL_H_ /* - * implementaion details for agr(4) driver. (contrast to if_agrvar.h) + * implementation details for agr(4) driver. (contrast to if_agrvar.h) */ #include diff --git a/sys/netbt/bt_sysctl.c b/sys/netbt/bt_sysctl.c index fbf813484203..6c6db8954b81 100644 --- a/sys/netbt/bt_sysctl.c +++ b/sys/netbt/bt_sysctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: bt_sysctl.c,v 1.3 2014/02/25 18:30:12 pooka Exp $ */ +/* $NetBSD: bt_sysctl.c,v 1.4 2023/03/26 19:10:33 andvar Exp $ */ /*- * Copyright (c) 2005 Iain Hibbert. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bt_sysctl.c,v 1.3 2014/02/25 18:30:12 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bt_sysctl.c,v 1.4 2023/03/26 19:10:33 andvar Exp $"); #include #include @@ -142,7 +142,7 @@ SYSCTL_SETUP(sysctl_net_bluetooth_setup, "sysctl net.bluetooth subtree setup") sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, CTLTYPE_NODE, "l2cap", - SYSCTL_DESCR("Logical Link Control & Adapataion Protocol"), + SYSCTL_DESCR("Logical Link Control & Adapatation Protocol"), NULL, 0, NULL, 0, CTL_NET, PF_BLUETOOTH, BTPROTO_L2CAP, CTL_EOL); diff --git a/tests/net/if_bridge/t_rtable.sh b/tests/net/if_bridge/t_rtable.sh index 917056574259..5037f5c6568a 100644 --- a/tests/net/if_bridge/t_rtable.sh +++ b/tests/net/if_bridge/t_rtable.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_rtable.sh,v 1.7 2019/08/19 03:22:05 ozaki-r Exp $ +# $NetBSD: t_rtable.sh,v 1.8 2023/03/26 19:10:34 andvar Exp $ # # Copyright (c) 2017 Internet Initiative Japan Inc. # All rights reserved. @@ -105,7 +105,7 @@ atf_test_case bridge_rtable_basic cleanup bridge_rtable_basic_head() { - atf_set "descr" "Tests basic opearaions of bridge's learning table" + atf_set "descr" "Tests basic operations of bridge's learning table" atf_set "require.progs" "rump_server" } diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index 56f76008e334..f49703859188 100644 --- a/usr.sbin/rarpd/rarpd.c +++ b/usr.sbin/rarpd/rarpd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rarpd.c,v 1.60 2018/02/13 10:17:04 martin Exp $ */ +/* $NetBSD: rarpd.c,v 1.61 2023/03/26 19:10:34 andvar Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -25,7 +25,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990\ #endif /* not lint */ #ifndef lint -__RCSID("$NetBSD: rarpd.c,v 1.60 2018/02/13 10:17:04 martin Exp $"); +__RCSID("$NetBSD: rarpd.c,v 1.61 2023/03/26 19:10:34 andvar Exp $"); #endif @@ -704,7 +704,7 @@ lookup_ipaddr(char *ifname, u_int32_t *addrp, u_int32_t *netmaskp) (void)close(fd); } /* - * Poke the kernel arp tables with the ethernet/ip address combinataion + * Poke the kernel arp tables with the ethernet/ip address combination * given. When processing a reply, we must do this so that the booting * host (i.e. the guy running rarpd), won't try to ARP for the hardware * address of the guy being booted (he cannot answer the ARP). diff --git a/usr.sbin/sysinst/arch/evbsh3/md.c b/usr.sbin/sysinst/arch/evbsh3/md.c index 1beea9b0b41b..96f1379dcf69 100644 --- a/usr.sbin/sysinst/arch/evbsh3/md.c +++ b/usr.sbin/sysinst/arch/evbsh3/md.c @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.7 2022/01/29 16:01:18 martin Exp $ */ +/* $NetBSD: md.c,v 1.8 2023/03/26 19:10:34 andvar Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -132,7 +132,7 @@ md_make_bsd_partitions(struct install_partition_desc *install) } /* - * any additional partition validataion + * any additional partition validation */ bool md_check_partitions(struct install_partition_desc *install)