diff options
| author | msaitoh <msaitoh@NetBSD.org> | 2021-12-05 04:54:20 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@NetBSD.org> | 2021-12-05 04:54:20 +0000 |
| commit | fe1137cb4f0e6dd245a3fe1fff79be06b85cc071 (patch) | |
| tree | 5644b7e760eb00fb52819e7dc47d92c325be8406 | |
| parent | b6f32f17d02d8cd8ddcb9c1f436d34a25ac5c4ce (diff) | |
s/from from/from/ in comment.
| -rw-r--r-- | crypto/dist/ipsec-tools/src/racoon/pfkey.c | 6 | ||||
| -rw-r--r-- | doc/CHANGES.prev | 8 | ||||
| -rw-r--r-- | share/mk/bsd.README | 4 | ||||
| -rw-r--r-- | share/terminfo/terminfo | 2 | ||||
| -rw-r--r-- | sys/arch/evbcf/include/bus_dma.h | 4 | ||||
| -rw-r--r-- | sys/arch/m68k/include/bus_dma.h | 4 | ||||
| -rw-r--r-- | sys/arch/m68k/m68k/bus_dma.c | 6 | ||||
| -rw-r--r-- | sys/arch/mvme68k/include/bus_dma.h | 4 | ||||
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/bus_dma.c | 6 | ||||
| -rw-r--r-- | sys/arch/next68k/include/vmparam.h | 4 | ||||
| -rw-r--r-- | sys/arch/next68k/next68k/isr.h | 4 | ||||
| -rw-r--r-- | sys/arch/next68k/next68k/seglist.h | 4 | ||||
| -rw-r--r-- | sys/arch/next68k/next68k/vectors.s | 4 | ||||
| -rw-r--r-- | sys/dev/ic/am79c930reg.h | 4 |
14 files changed, 32 insertions, 32 deletions
diff --git a/crypto/dist/ipsec-tools/src/racoon/pfkey.c b/crypto/dist/ipsec-tools/src/racoon/pfkey.c index c40d9ed2c58..23482a0bed3 100644 --- a/crypto/dist/ipsec-tools/src/racoon/pfkey.c +++ b/crypto/dist/ipsec-tools/src/racoon/pfkey.c @@ -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_list_len) 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) */ diff --git a/doc/CHANGES.prev b/doc/CHANGES.prev index 6bb3e6fae11..4ce87865c0e 100644 --- a/doc/CHANGES.prev +++ b/doc/CHANGES.prev @@ -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 gordon@sneaky.lonestar.org (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. diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 569bebe2130..0bc58515fd9 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -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 diff --git a/share/terminfo/terminfo b/share/terminfo/terminfo index b70fa1ca941..039666d2a70 100644 --- a/share/terminfo/terminfo +++ b/share/terminfo/terminfo @@ -24744,7 +24744,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # * 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): diff --git a/sys/arch/evbcf/include/bus_dma.h b/sys/arch/evbcf/include/bus_dma.h index 6db50430b6b..f6b38f0b6fa 100644 --- a/sys/arch/evbcf/include/bus_dma.h +++ b/sys/arch/evbcf/include/bus_dma.h @@ -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 */ diff --git a/sys/arch/m68k/include/bus_dma.h b/sys/arch/m68k/include/bus_dma.h index de833e010c0..064388762ee 100644 --- a/sys/arch/m68k/include/bus_dma.h +++ b/sys/arch/m68k/include/bus_dma.h @@ -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 <dbj@NetBSD.org> 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 diff --git a/sys/arch/m68k/m68k/bus_dma.c b/sys/arch/m68k/m68k/bus_dma.c index 9a8e3c673b8..1724a50311e 100644 --- a/sys/arch/m68k/m68k/bus_dma.c +++ b/sys/arch/m68k/m68k/bus_dma.c @@ -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 <dbj@NetBSD.org> 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> diff --git a/sys/arch/mvme68k/include/bus_dma.h b/sys/arch/mvme68k/include/bus_dma.h index 6a914f74881..896957dd59a 100644 --- a/sys/arch/mvme68k/include/bus_dma.h +++ b/sys/arch/mvme68k/include/bus_dma.h @@ -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 */ diff --git a/sys/arch/mvme68k/mvme68k/bus_dma.c b/sys/arch/mvme68k/mvme68k/bus_dma.c index 0d3725012fa..20fdfac126b 100644 --- a/sys/arch/mvme68k/mvme68k/bus_dma.c +++ b/sys/arch/mvme68k/mvme68k/bus_dma.c @@ -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> diff --git a/sys/arch/next68k/include/vmparam.h b/sys/arch/next68k/include/vmparam.h index ad82a983307..aaa02bdc21f 100644 --- a/sys/arch/next68k/include/vmparam.h +++ b/sys/arch/next68k/include/vmparam.h @@ -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 <jewell@mit.edu> Fri Aug 28 03:22:07 1998 * original cvs id: NetBSD: vmparam.h,v 1.9 1998/08/22 10:55:34 scw Exp diff --git a/sys/arch/next68k/next68k/isr.h b/sys/arch/next68k/next68k/isr.h index c121ee5d8c1..e5d3054917f 100644 --- a/sys/arch/next68k/next68k/isr.h +++ b/sys/arch/next68k/next68k/isr.h @@ -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 <jewell@mit.edu> Tue Nov 10 05:07:16 1998 * original cvs id: NetBSD: isr.h,v 1.3 1997/10/09 08:40:06 jtc Exp diff --git a/sys/arch/next68k/next68k/seglist.h b/sys/arch/next68k/next68k/seglist.h index d3e85fb0779..b23d8fc1173 100644 --- a/sys/arch/next68k/next68k/seglist.h +++ b/sys/arch/next68k/next68k/seglist.h @@ -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 <jewell@mit.edu> Tue Nov 10 05:07:16 1998 * original cvs id: NetBSD: seglist.h,v 1.4 1998/08/22 10:55:35 scw Exp diff --git a/sys/arch/next68k/next68k/vectors.s b/sys/arch/next68k/next68k/vectors.s index 471c64f923a..192411431f3 100644 --- a/sys/arch/next68k/next68k/vectors.s +++ b/sys/arch/next68k/next68k/vectors.s @@ -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 <jewell@mit.edu> Tue Nov 10 05:07:16 1998 | original cvs id: NetBSD: vectors.s,v 1.7 1998/10/18 04:42:37 itohy Exp diff --git a/sys/dev/ic/am79c930reg.h b/sys/dev/ic/am79c930reg.h index 679261d6362..0a709796511 100644 --- a/sys/dev/ic/am79c930reg.h +++ b/sys/dev/ic/am79c930reg.h @@ -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. * |
