Module Name: src
Committed By: andvar
Date: Tue Jan 7 17:39:46 UTC 2025
Modified Files:
src/sys/arch/powerpc/booke/dev: pq3etsec.c
src/sys/dev/i2c: m41t00.c max6900.c
src/sys/ufs/lfs: CHANGES
src/usr.sbin/perfused: msg.c
Log Message:
s/remaing/remaining/ s/containg/containing/, mainly in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/i2c/m41t00.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/i2c/max6900.c
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/lfs/CHANGES
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/perfused/msg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.60 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.61
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.60 Sat Jun 29 12:11:11 2024
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c Tue Jan 7 17:39:45 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3etsec.c,v 1.60 2024/06/29 12:11:11 riastradh Exp $ */
+/* $NetBSD: pq3etsec.c,v 1.61 2025/01/07 17:39:45 andvar Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.60 2024/06/29 12:11:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.61 2025/01/07 17:39:45 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1092,7 +1092,7 @@ pq3etsec_ifstop(struct ifnet *ifp, int d
etsec_write(sc, MIIMCFG, miimcfg);
/*
- * Let's consume any remaing transmitted packets. And if we are
+ * Let's consume any remaining transmitted packets. And if we are
* disabling the interface, purge ourselves of any untransmitted
* packets. But don't consume any received packets, just drop them.
* If we aren't disabling the interface, save the mbufs in the
Index: src/sys/dev/i2c/m41t00.c
diff -u src/sys/dev/i2c/m41t00.c:1.23 src/sys/dev/i2c/m41t00.c:1.24
--- src/sys/dev/i2c/m41t00.c:1.23 Thu Jan 2 19:11:12 2020
+++ src/sys/dev/i2c/m41t00.c Tue Jan 7 17:39:45 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: m41t00.c,v 1.23 2020/01/02 19:11:12 thorpej Exp $ */
+/* $NetBSD: m41t00.c,v 1.24 2025/01/07 17:39:45 andvar Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: m41t00.c,v 1.23 2020/01/02 19:11:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m41t00.c,v 1.24 2025/01/07 17:39:45 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -335,7 +335,7 @@ m41t00_settime_ymdhms(struct todr_chip_h
*
* - writing SECONDS
* - reading back SECONDS, remembering it as "initial seconds"
- * - write the remaing RTC registers
+ * - write the remaining RTC registers
* - read back SECONDS as "final seconds"
* - if "initial seconds" == 59, ensure "final seconds" == 59
* - else, ensure "final seconds" is no more than one second
Index: src/sys/dev/i2c/max6900.c
diff -u src/sys/dev/i2c/max6900.c:1.18 src/sys/dev/i2c/max6900.c:1.19
--- src/sys/dev/i2c/max6900.c:1.18 Thu Jan 2 18:57:58 2020
+++ src/sys/dev/i2c/max6900.c Tue Jan 7 17:39:45 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: max6900.c,v 1.18 2020/01/02 18:57:58 thorpej Exp $ */
+/* $NetBSD: max6900.c,v 1.19 2025/01/07 17:39:45 andvar Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: max6900.c,v 1.18 2020/01/02 18:57:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: max6900.c,v 1.19 2025/01/07 17:39:45 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -380,7 +380,7 @@ maxrtc_settime_ymdhms(struct todr_chip_h
*
* - writing SECONDS
* - reading back SECONDS, remembering it as "initial seconds"
- * - write the remaing RTC registers
+ * - write the remaining RTC registers
* - read back SECONDS as "final seconds"
* - if "initial seconds" == 59, ensure "final seconds" == 59
* - else, ensure "final seconds" is no more than one second
Index: src/sys/ufs/lfs/CHANGES
diff -u src/sys/ufs/lfs/CHANGES:1.6 src/sys/ufs/lfs/CHANGES:1.7
--- src/sys/ufs/lfs/CHANGES:1.6 Fri Feb 9 22:08:38 2024
+++ src/sys/ufs/lfs/CHANGES Tue Jan 7 17:39:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES,v 1.6 2024/02/09 22:08:38 andvar Exp $
+# $NetBSD: CHANGES,v 1.7 2025/01/07 17:39:45 andvar Exp $
kernel:
@@ -6,7 +6,7 @@ kernel:
locked by another process, lfs_markv will process the rest of the
inodes passed to it and then return EAGAIN. The cleaner will
recognize this and not mark the segment clean. When the cleaner runs
- again, the segment containg the (formerly) locked inode will sort high
+ again, the segment containing the (formerly) locked inode will sort high
for cleaning, since it is now almost entirely empty.
- A beginning has been made to test keeping atime information in the
Index: src/usr.sbin/perfused/msg.c
diff -u src/usr.sbin/perfused/msg.c:1.26 src/usr.sbin/perfused/msg.c:1.27
--- src/usr.sbin/perfused/msg.c:1.26 Sun Aug 8 20:54:49 2021
+++ src/usr.sbin/perfused/msg.c Tue Jan 7 17:39:45 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.c,v 1.26 2021/08/08 20:54:49 nia Exp $ */
+/* $NetBSD: msg.c,v 1.27 2025/01/07 17:39:45 andvar Exp $ */
/*-
* Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -513,7 +513,7 @@ perfused_readframe(struct puffs_usermoun
#endif
/*
- * We have a header, get remaing length to read
+ * We have a header, get remaining length to read
*/
if (puffs_framebuf_getdata_atoff(pufbuf, 0, &foh, sizeof(foh)) != 0)
DERR(EX_SOFTWARE, "puffs_framebuf_getdata_atoff failed");
