Module Name: src
Committed By: msaitoh
Date: Sun Dec 5 04:54:21 UTC 2021
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: pfkey.c
src/doc: CHANGES.prev
src/share/mk: bsd.README
src/share/terminfo: terminfo
src/sys/arch/evbcf/include: bus_dma.h
src/sys/arch/m68k/include: bus_dma.h
src/sys/arch/m68k/m68k: bus_dma.c
src/sys/arch/mvme68k/include: bus_dma.h
src/sys/arch/mvme68k/mvme68k: bus_dma.c
src/sys/arch/next68k/include: vmparam.h
src/sys/arch/next68k/next68k: isr.h seglist.h vectors.s
src/sys/dev/ic: am79c930reg.h
Log Message:
s/from from/from/ in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/crypto/dist/ipsec-tools/src/racoon/pfkey.c
cvs rdiff -u -r1.161 -r1.162 src/doc/CHANGES.prev
cvs rdiff -u -r1.423 -r1.424 src/share/mk/bsd.README
cvs rdiff -u -r1.14 -r1.15 src/share/terminfo/terminfo
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbcf/include/bus_dma.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/m68k/include/bus_dma.h
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/m68k/m68k/bus_dma.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mvme68k/include/bus_dma.h
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/mvme68k/mvme68k/bus_dma.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/next68k/include/vmparam.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/next68k/next68k/isr.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/next68k/next68k/seglist.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/next68k/next68k/vectors.s
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/am79c930reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/pfkey.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.61 src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.62
--- src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.61 Sat May 19 20:14:56 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/pfkey.c Sun Dec 5 04:54:20 2021
@@ -1,6 +1,6 @@
-/* $NetBSD: pfkey.c,v 1.61 2018/05/19 20:14:56 maxv Exp $ */
+/* $NetBSD: pfkey.c,v 1.62 2021/12/05 04:54:20 msaitoh Exp $ */
-/* $Id: pfkey.c,v 1.61 2018/05/19 20:14:56 maxv Exp $ */
+/* $Id: pfkey.c,v 1.62 2021/12/05 04:54:20 msaitoh Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -3252,7 +3252,7 @@ migrate_sp_isr_list(sp, xisr_list, xisr_
int xisr_old_len, xisr_new_len;
struct ipsecrequest *isr_cur;
- isr_cur = sp->req; /* ipsecrequest list from from sp */
+ isr_cur = sp->req; /* ipsecrequest list from sp */
while (xisr_list_len > 0 && isr_cur != NULL) {
/* Get old xisr (length field is in bytes) */
Index: src/doc/CHANGES.prev
diff -u src/doc/CHANGES.prev:1.161 src/doc/CHANGES.prev:1.162
--- src/doc/CHANGES.prev:1.161 Sun Dec 5 04:39:49 2021
+++ src/doc/CHANGES.prev Sun Dec 5 04:54:20 2021
@@ -1,4 +1,4 @@
-LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.161 $>
+LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.162 $>
Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8:
@@ -939,7 +939,7 @@ Changes from NetBSD 0.9 to NetBSD 1.0:
ed(1): fixed line addressing to be consistent with SunOS ed (alm)
i386: change bootcode to not skip the 256 bytes of BIOS variables
if load address isn't 0 (ws)
- stdio: more fixes from from torek with help from cgd. (cgd)
+ stdio: more fixes from torek with help from cgd. (cgd)
termcap(3): Fix man page to have the correct definition of
tgetstr(). fix supplied by
[email protected] (Gordon Burditt). (cgd)
@@ -3809,7 +3809,7 @@ Changes from NetBSD 1.2 to NetBSD 1.3:
ethernet: add ne2000 ISA Plug-and-Play attachment. [matt 19971016]
audio: Add libossaudio to make porting Linux audio programs easier.
[augustss 19971016]
- pcmcia: Add Marc Horowitz's new PCMCIA framework, with help from from
+ pcmcia: Add Marc Horowitz's new PCMCIA framework, with help from
John Kohl, Matt Thomas, Enami Tsugutomo, Bill Sommerfeld,
Jason Thorpe, and others. Supports several common PCMCIA
devices. [thorpej 19971016]
@@ -8465,7 +8465,7 @@ Changes from NetBSD 3.0 to NetBSD 4.0:
sun3: Add MI softintr(9) support by shared sources with sun2 port.
[tsutsui 20061005]
sparc64: Add floppy support based on sparc driver and hints from
- from OpenBSD for sbus/ebus attachment. [jnemeth 20061006]
+ OpenBSD for sbus/ebus attachment. [jnemeth 20061006]
find(1): Add support for "find ... -exec ... +". Written by
John Hawkinson. [apb 20061007]
tcp_congctl(9): API for TCP congestion control algorithms.
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.423 src/share/mk/bsd.README:1.424
--- src/share/mk/bsd.README:1.423 Sun Nov 28 15:47:33 2021
+++ src/share/mk/bsd.README Sun Dec 5 04:54:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.423 2021/11/28 15:47:33 christos Exp $
+# $NetBSD: bsd.README,v 1.424 2021/12/05 04:54:20 msaitoh Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1419,7 +1419,7 @@ Libraries are ranlib'd when made.
=-=-=-=-= bsd.links.mk =-=-=-=-=
The include file <bsd.links.mk> handles the LINKS and SYMLINKS variables
-and is included from from <bsd.lib.mk> and <bsd.prog.mk>.
+and is included from <bsd.lib.mk> and <bsd.prog.mk>.
LINKSOWN, LINKSGRP, and LINKSMODE, are relevant only if a metadata log
is used. The defaults may be modified by other bsd.*.mk files which
Index: src/share/terminfo/terminfo
diff -u src/share/terminfo/terminfo:1.14 src/share/terminfo/terminfo:1.15
--- src/share/terminfo/terminfo:1.14 Sat Oct 10 12:57:39 2020
+++ src/share/terminfo/terminfo Sun Dec 5 04:54:20 2021
@@ -24744,7 +24744,7 @@ v3220|LANPAR Vision II model 3220/3221/3
# * Replaced Qume QVT and Freedom-series entries with purpose-built
# terminfo entries.
# * Enhanced vt220, tvi910, tvi924, hpterm, hp2645, adm42, tek
-# and dg200 entries using caps from from SCO.
+# and dg200 entries using caps from SCO.
# * Added the usual set of function-key mappings to ANSI entry.
# * Corrected xterm's function-key capabilities.
# 9.4.5 (Tue Mar 28 14:27:49 EST 1995):
Index: src/sys/arch/evbcf/include/bus_dma.h
diff -u src/sys/arch/evbcf/include/bus_dma.h:1.2 src/sys/arch/evbcf/include/bus_dma.h:1.3
--- src/sys/arch/evbcf/include/bus_dma.h:1.2 Tue Mar 18 18:20:41 2014
+++ src/sys/arch/evbcf/include/bus_dma.h Sun Dec 5 04:54:20 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: bus_dma.h,v 1.2 2014/03/18 18:20:41 riastradh Exp $ */
+/* $NetBSD: bus_dma.h,v 1.3 2021/12/05 04:54:20 msaitoh Exp $ */
/*
- * This file was extracted from from next68k/include/bus.h
+ * This file was extracted from next68k/include/bus.h
* and should probably be resynced when needed.
* original cvs id: NetBSD: bus_dma.h,v 1.3 1999/08/05 01:50:59 dbj Exp
*/
Index: src/sys/arch/m68k/include/bus_dma.h
diff -u src/sys/arch/m68k/include/bus_dma.h:1.12 src/sys/arch/m68k/include/bus_dma.h:1.13
--- src/sys/arch/m68k/include/bus_dma.h:1.12 Thu Jun 30 20:09:32 2011
+++ src/sys/arch/m68k/include/bus_dma.h Sun Dec 5 04:54:20 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: bus_dma.h,v 1.12 2011/06/30 20:09:32 wiz Exp $ */
+/* $NetBSD: bus_dma.h,v 1.13 2021/12/05 04:54:20 msaitoh Exp $ */
/*
- * This file was extracted from from alpha/include/bus.h
+ * This file was extracted from alpha/include/bus.h
* and should probably be resynced when needed.
* Darrin B. Jewell <[email protected]> Sat Jul 31 06:11:33 UTC 1999
* original cvs id: NetBSD: bus.h,v 1.29 1999/06/18 04:49:24 cgd Exp
Index: src/sys/arch/m68k/m68k/bus_dma.c
diff -u src/sys/arch/m68k/m68k/bus_dma.c:1.36 src/sys/arch/m68k/m68k/bus_dma.c:1.37
--- src/sys/arch/m68k/m68k/bus_dma.c:1.36 Sat Dec 19 21:39:24 2020
+++ src/sys/arch/m68k/m68k/bus_dma.c Sun Dec 5 04:54:20 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: bus_dma.c,v 1.36 2020/12/19 21:39:24 thorpej Exp $ */
+/* $NetBSD: bus_dma.c,v 1.37 2021/12/05 04:54:20 msaitoh Exp $ */
/*
- * This file was taken from from alpha/common/bus_dma.c
+ * This file was taken from alpha/common/bus_dma.c
* should probably be re-synced when needed.
* Darrin B. Jewell <[email protected]> Sat Jul 31 06:11:33 UTC 1999
* original cvs id: NetBSD: bus_dma.c,v 1.31 1999/07/08 18:05:23 thorpej Exp
@@ -41,7 +41,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.36 2020/12/19 21:39:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.37 2021/12/05 04:54:20 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/mvme68k/include/bus_dma.h
diff -u src/sys/arch/mvme68k/include/bus_dma.h:1.16 src/sys/arch/mvme68k/include/bus_dma.h:1.17
--- src/sys/arch/mvme68k/include/bus_dma.h:1.16 Mon Apr 28 20:23:29 2008
+++ src/sys/arch/mvme68k/include/bus_dma.h Sun Dec 5 04:54:20 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: bus_dma.h,v 1.16 2008/04/28 20:23:29 martin Exp $ */
+/* $NetBSD: bus_dma.h,v 1.17 2021/12/05 04:54:20 msaitoh Exp $ */
/*
- * This file was extracted from from next68k/include/bus.h
+ * This file was extracted from next68k/include/bus.h
* and should probably be resynced when needed.
* original cvs id: NetBSD: bus_dma.h,v 1.3 1999/08/05 01:50:59 dbj Exp
*/
Index: src/sys/arch/mvme68k/mvme68k/bus_dma.c
diff -u src/sys/arch/mvme68k/mvme68k/bus_dma.c:1.38 src/sys/arch/mvme68k/mvme68k/bus_dma.c:1.39
--- src/sys/arch/mvme68k/mvme68k/bus_dma.c:1.38 Sat Nov 21 17:59:13 2020
+++ src/sys/arch/mvme68k/mvme68k/bus_dma.c Sun Dec 5 04:54:21 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: bus_dma.c,v 1.38 2020/11/21 17:59:13 thorpej Exp $ */
+/* $NetBSD: bus_dma.c,v 1.39 2021/12/05 04:54:21 msaitoh Exp $ */
/*
- * This file was taken from from next68k/dev/bus_dma.c, which was originally
+ * This file was taken from next68k/dev/bus_dma.c, which was originally
* taken from alpha/common/bus_dma.c.
* It should probably be re-synced when needed.
* original cvs id: NetBSD: bus_dma.c,v 1.13 1999/11/13 00:30:40 thorpej Exp
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.38 2020/11/21 17:59:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.39 2021/12/05 04:54:21 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/next68k/include/vmparam.h
diff -u src/sys/arch/next68k/include/vmparam.h:1.27 src/sys/arch/next68k/include/vmparam.h:1.28
--- src/sys/arch/next68k/include/vmparam.h:1.27 Sat Feb 1 19:41:49 2020
+++ src/sys/arch/next68k/include/vmparam.h Sun Dec 5 04:54:21 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: vmparam.h,v 1.27 2020/02/01 19:41:49 tsutsui Exp $ */
+/* $NetBSD: vmparam.h,v 1.28 2021/12/05 04:54:21 msaitoh Exp $ */
/*
- * This file was taken from from mvme68k/include/vmparam.h and
+ * This file was taken from mvme68k/include/vmparam.h and
* should probably be re-synced when needed.
* Darrin B Jewell <[email protected]> Fri Aug 28 03:22:07 1998
* original cvs id: NetBSD: vmparam.h,v 1.9 1998/08/22 10:55:34 scw Exp
Index: src/sys/arch/next68k/next68k/isr.h
diff -u src/sys/arch/next68k/next68k/isr.h:1.7 src/sys/arch/next68k/next68k/isr.h:1.8
--- src/sys/arch/next68k/next68k/isr.h:1.7 Mon Apr 28 20:23:30 2008
+++ src/sys/arch/next68k/next68k/isr.h Sun Dec 5 04:54:21 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: isr.h,v 1.7 2008/04/28 20:23:30 martin Exp $ */
+/* $NetBSD: isr.h,v 1.8 2021/12/05 04:54:21 msaitoh Exp $ */
/*
- * This file was taken from from mvme68k/mvme68k/isr.h
+ * This file was taken from mvme68k/mvme68k/isr.h
* should probably be re-synced when needed.
* Darrin B. Jewell <[email protected]> Tue Nov 10 05:07:16 1998
* original cvs id: NetBSD: isr.h,v 1.3 1997/10/09 08:40:06 jtc Exp
Index: src/sys/arch/next68k/next68k/seglist.h
diff -u src/sys/arch/next68k/next68k/seglist.h:1.6 src/sys/arch/next68k/next68k/seglist.h:1.7
--- src/sys/arch/next68k/next68k/seglist.h:1.6 Fri Oct 23 17:01:08 2009
+++ src/sys/arch/next68k/next68k/seglist.h Sun Dec 5 04:54:21 2021
@@ -1,7 +1,7 @@
-/* $NetBSD: seglist.h,v 1.6 2009/10/23 17:01:08 snj Exp $ */
+/* $NetBSD: seglist.h,v 1.7 2021/12/05 04:54:21 msaitoh Exp $ */
/*
- * This file was taken from from mvme68k/mvme68k/seglist.h
+ * This file was taken from mvme68k/mvme68k/seglist.h
* should probably be re-synced when needed.
* Darrin B. Jewell <[email protected]> Tue Nov 10 05:07:16 1998
* original cvs id: NetBSD: seglist.h,v 1.4 1998/08/22 10:55:35 scw Exp
Index: src/sys/arch/next68k/next68k/vectors.s
diff -u src/sys/arch/next68k/next68k/vectors.s:1.11 src/sys/arch/next68k/next68k/vectors.s:1.12
--- src/sys/arch/next68k/next68k/vectors.s:1.11 Tue Feb 8 20:20:21 2011
+++ src/sys/arch/next68k/next68k/vectors.s Sun Dec 5 04:54:21 2021
@@ -1,6 +1,6 @@
-| $NetBSD: vectors.s,v 1.11 2011/02/08 20:20:21 rmind Exp $
+| $NetBSD: vectors.s,v 1.12 2021/12/05 04:54:21 msaitoh Exp $
-| This file was taken from from mvme68k/mvme68k/vectors.s
+| This file was taken from mvme68k/mvme68k/vectors.s
| should probably be re-synced when needed.
| Darrin B. Jewell <[email protected]> Tue Nov 10 05:07:16 1998
| original cvs id: NetBSD: vectors.s,v 1.7 1998/10/18 04:42:37 itohy Exp
Index: src/sys/dev/ic/am79c930reg.h
diff -u src/sys/dev/ic/am79c930reg.h:1.7 src/sys/dev/ic/am79c930reg.h:1.8
--- src/sys/dev/ic/am79c930reg.h:1.7 Mon Apr 28 20:23:49 2008
+++ src/sys/dev/ic/am79c930reg.h Sun Dec 5 04:54:21 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: am79c930reg.h,v 1.7 2008/04/28 20:23:49 martin Exp $ */
+/* $NetBSD: am79c930reg.h,v 1.8 2021/12/05 04:54:21 msaitoh Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
/*
- * Device register definitions gleaned from from the AMD "Am79C930
+ * Device register definitions gleaned from the AMD "Am79C930
* PCnet(tm)-Mobile Single Chip Wireless LAN Media Access Controller"
* data sheet, AMD Pub #20183, Rev B, amendment/0, issue date August 1997.
*
