Module Name: src
Committed By: martin
Date: Wed Dec 18 20:04:34 UTC 2019
Modified Files:
src/sys/arch/amigappc/include [netbsd-9]: intr.h
src/sys/arch/arm/at91 [netbsd-9]: at91dbgu.c
src/sys/arch/emips/ebus [netbsd-9]: ace_ebus.c flash_ebus.c
src/sys/arch/emips/emips [netbsd-9]: bus_space.c
src/sys/arch/emips/include [netbsd-9]: loadfile_machdep.h
src/sys/arch/emips/stand/common [netbsd-9]: bootinfo.c bootinfo.h
bootxx.c prom_iface.c
src/sys/arch/hpc/stand/hpcboot/arm [netbsd-9]: arm_pxa2x0_asm.asm
arm_sa1100_asm.asm
src/sys/arch/hpcarm/include [netbsd-9]: kloader.h
src/sys/arch/ia64/ia64 [netbsd-9]: bus_space.c
src/sys/arch/ia64/include [netbsd-9]: bus.h
src/sys/arch/mips/cavium [netbsd-9]: octeon_dma.c
src/sys/arch/x68k/dev [netbsd-9]: intiovar.h mfp.c
src/sys/arch/zaurus/include [netbsd-9]: kloader.h
src/sys/compat/common [netbsd-9]: kern_time_30.c sysv_msg_50.c
sysv_sem_50.c sysv_shm_50.c uipc_syscalls_50.c vfs_syscalls_50.c
src/sys/compat/net [netbsd-9]: if.h
src/sys/compat/netbsd32 [netbsd-9]: netbsd32_compat_16.c
netbsd32_compat_50.c netbsd32_compat_50_sysv.c netbsd32_compat_60.c
src/sys/compat/netinet6 [netbsd-9]: in6_var.h
src/sys/compat/ultrix [netbsd-9]: ultrix_exec.h
src/sys/dev/ic [netbsd-9]: adv.c adv.h advlib.c advlib.h advmcode.c
advmcode.h adw.c adw.h adwlib.c adwlib.h adwmcode.c adwmcode.h
src/sys/dev/raidframe [netbsd-9]: rf_compat50.c rf_compat50.h
src/sys/dev/usb [netbsd-9]: uberry.c uipad.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #570):
sys/compat/netbsd32/netbsd32_compat_50_sysv.c: revision 1.3
sys/dev/raidframe/rf_compat50.h: revision 1.6
sys/arch/emips/emips/bus_space.c: revision 1.3
sys/compat/net/if.h: revision 1.5
sys/arch/emips/stand/common/bootinfo.c: revision 1.2
sys/compat/common/sysv_msg_50.c: revision 1.5
sys/compat/common/kern_time_30.c: revision 1.8
sys/arch/emips/stand/common/bootinfo.h: revision 1.2
sys/arch/ia64/include/bus.h: revision 1.4
sys/arch/ia64/ia64/bus_space.c: revision 1.2
sys/compat/common/sysv_shm_50.c: revision 1.5
sys/dev/ic/adw.h: revision 1.15
sys/compat/common/uipc_syscalls_50.c: revision 1.10
sys/arch/emips/ebus/flash_ebus.c: revision 1.22
sys/dev/ic/adv.h: revision 1.15
sys/dev/ic/adwmcode.c: revision 1.18
sys/dev/ic/advlib.c: revision 1.29
sys/arch/hpcarm/include/kloader.h: revision 1.3
sys/dev/usb/uberry.c: revision 1.16
sys/compat/common/sysv_sem_50.c: revision 1.5
sys/compat/netbsd32/netbsd32_compat_50.c: revision 1.43
sys/dev/ic/advlib.h: revision 1.21
sys/dev/ic/adv.c: revision 1.50
sys/compat/netinet6/in6_var.h: revision 1.5
sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm: revision 1.2
sys/arch/emips/include/loadfile_machdep.h: revision 1.3
sys/arch/emips/stand/common/prom_iface.c: revision 1.7
sys/dev/ic/adw.c: revision 1.56
sys/dev/ic/adwmcode.h: revision 1.12
sys/dev/ic/advmcode.c: revision 1.10
sys/arch/emips/ebus/ace_ebus.c: revision 1.22
sys/compat/netbsd32/netbsd32_compat_60.c: revision 1.5
sys/dev/raidframe/rf_compat50.c: revision 1.13
sys/arch/x68k/dev/intiovar.h: revision 1.15
sys/dev/usb/uipad.c: revision 1.8
sys/arch/zaurus/include/kloader.h: revision 1.3
sys/arch/emips/stand/common/bootxx.c: revision 1.2
sys/dev/ic/adwlib.h: revision 1.23
sys/dev/ic/adwlib.c: revision 1.44
sys/compat/netbsd32/netbsd32_compat_16.c: revision 1.3
sys/arch/amigappc/include/intr.h: revision 1.27
sys/arch/x68k/dev/mfp.c: revision 1.27
sys/arch/arm/at91/at91dbgu.c: revision 1.17
sys/dev/ic/advmcode.h: revision 1.7
sys/compat/ultrix/ultrix_exec.h: revision 1.7
sys/compat/common/vfs_syscalls_50.c: revision 1.24
sys/arch/mips/cavium/octeon_dma.c: revision 1.3
sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm: revision 1.2
Remove clause 3 and 4 from TNF licenses.
Ok'ed by martin@ in PR/54760.
Remove clause 3 and 4 leftovers from TNF licenses in more sources.
Confirmed by martin@ in PR/54760.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.58.1 src/sys/arch/amigappc/include/intr.h
cvs rdiff -u -r1.15 -r1.15.22.1 src/sys/arch/arm/at91/at91dbgu.c
cvs rdiff -u -r1.20.20.1 -r1.20.20.2 src/sys/arch/emips/ebus/ace_ebus.c
cvs rdiff -u -r1.20.8.1 -r1.20.8.2 src/sys/arch/emips/ebus/flash_ebus.c
cvs rdiff -u -r1.2 -r1.2.52.1 src/sys/arch/emips/emips/bus_space.c
cvs rdiff -u -r1.2 -r1.2.32.1 src/sys/arch/emips/include/loadfile_machdep.h
cvs rdiff -u -r1.1 -r1.1.66.1 src/sys/arch/emips/stand/common/bootinfo.c \
src/sys/arch/emips/stand/common/bootinfo.h \
src/sys/arch/emips/stand/common/bootxx.c
cvs rdiff -u -r1.6 -r1.6.22.1 src/sys/arch/emips/stand/common/prom_iface.c
cvs rdiff -u -r1.1 -r1.1.70.1 \
src/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm \
src/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm
cvs rdiff -u -r1.2 -r1.2.22.1 src/sys/arch/hpcarm/include/kloader.h
cvs rdiff -u -r1.1 -r1.1.70.1 src/sys/arch/ia64/ia64/bus_space.c
cvs rdiff -u -r1.2 -r1.2.20.1 src/sys/arch/ia64/include/bus.h
cvs rdiff -u -r1.2 -r1.2.24.1 src/sys/arch/mips/cavium/octeon_dma.c
cvs rdiff -u -r1.14 -r1.14.42.1 src/sys/arch/x68k/dev/intiovar.h
cvs rdiff -u -r1.26 -r1.26.34.1 src/sys/arch/x68k/dev/mfp.c
cvs rdiff -u -r1.2 -r1.2.22.1 src/sys/arch/zaurus/include/kloader.h
cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/compat/common/kern_time_30.c
cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/compat/common/sysv_msg_50.c \
src/sys/compat/common/sysv_sem_50.c src/sys/compat/common/sysv_shm_50.c
cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/compat/common/uipc_syscalls_50.c
cvs rdiff -u -r1.23 -r1.23.2.1 src/sys/compat/common/vfs_syscalls_50.c
cvs rdiff -u -r1.4 -r1.4.20.1 src/sys/compat/net/if.h
cvs rdiff -u -r1.2 -r1.2.6.1 src/sys/compat/netbsd32/netbsd32_compat_16.c
cvs rdiff -u -r1.39 -r1.39.2.1 src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.2 -r1.2.4.1 \
src/sys/compat/netbsd32/netbsd32_compat_50_sysv.c
cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/compat/netbsd32/netbsd32_compat_60.c
cvs rdiff -u -r1.4 -r1.4.6.1 src/sys/compat/netinet6/in6_var.h
cvs rdiff -u -r1.6 -r1.6.72.1 src/sys/compat/ultrix/ultrix_exec.h
cvs rdiff -u -r1.48 -r1.48.6.1 src/sys/dev/ic/adv.c
cvs rdiff -u -r1.13 -r1.13.170.1 src/sys/dev/ic/adv.h
cvs rdiff -u -r1.27 -r1.27.66.1 src/sys/dev/ic/advlib.c
cvs rdiff -u -r1.19 -r1.19.44.1 src/sys/dev/ic/advlib.h
cvs rdiff -u -r1.9 -r1.9.170.1 src/sys/dev/ic/advmcode.c
cvs rdiff -u -r1.6 -r1.6.170.1 src/sys/dev/ic/advmcode.h
cvs rdiff -u -r1.54 -r1.54.24.1 src/sys/dev/ic/adw.c
cvs rdiff -u -r1.14 -r1.14.170.1 src/sys/dev/ic/adw.h
cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/dev/ic/adwlib.c
cvs rdiff -u -r1.21 -r1.21.44.1 src/sys/dev/ic/adwlib.h
cvs rdiff -u -r1.17 -r1.17.70.1 src/sys/dev/ic/adwmcode.c
cvs rdiff -u -r1.11 -r1.11.170.1 src/sys/dev/ic/adwmcode.h
cvs rdiff -u -r1.10 -r1.10.4.1 src/sys/dev/raidframe/rf_compat50.c
cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/dev/raidframe/rf_compat50.h
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/dev/usb/uberry.c
cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/dev/usb/uipad.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/amigappc/include/intr.h
diff -u src/sys/arch/amigappc/include/intr.h:1.26 src/sys/arch/amigappc/include/intr.h:1.26.58.1
--- src/sys/arch/amigappc/include/intr.h:1.26 Sun Jun 19 08:00:56 2011
+++ src/sys/arch/amigappc/include/intr.h Wed Dec 18 20:04:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.26 2011/06/19 08:00:56 matt Exp $ */
+/* $NetBSD: intr.h,v 1.26.58.1 2019/12/18 20:04:34 martin Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/arm/at91/at91dbgu.c
diff -u src/sys/arch/arm/at91/at91dbgu.c:1.15 src/sys/arch/arm/at91/at91dbgu.c:1.15.22.1
--- src/sys/arch/arm/at91/at91dbgu.c:1.15 Mon Sep 21 13:31:30 2015
+++ src/sys/arch/arm/at91/at91dbgu.c Wed Dec 18 20:04:34 2019
@@ -1,5 +1,5 @@
-/* $Id: at91dbgu.c,v 1.15 2015/09/21 13:31:30 skrll Exp $ */
-/* $NetBSD: at91dbgu.c,v 1.15 2015/09/21 13:31:30 skrll Exp $ */
+/* $Id: at91dbgu.c,v 1.15.22.1 2019/12/18 20:04:34 martin Exp $ */
+/* $NetBSD: at91dbgu.c,v 1.15.22.1 2019/12/18 20:04:34 martin Exp $ */
/*
*
@@ -26,13 +26,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -83,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.15 2015/09/21 13:31:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.15.22.1 2019/12/18 20:04:34 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
Index: src/sys/arch/emips/ebus/ace_ebus.c
diff -u src/sys/arch/emips/ebus/ace_ebus.c:1.20.20.1 src/sys/arch/emips/ebus/ace_ebus.c:1.20.20.2
--- src/sys/arch/emips/ebus/ace_ebus.c:1.20.20.1 Sun Dec 8 14:43:16 2019
+++ src/sys/arch/emips/ebus/ace_ebus.c Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ace_ebus.c,v 1.20.20.1 2019/12/08 14:43:16 martin Exp $ */
+/* $NetBSD: ace_ebus.c,v 1.20.20.2 2019/12/18 20:04:33 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.20.20.1 2019/12/08 14:43:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.20.20.2 2019/12/18 20:04:33 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1501,13 +1501,6 @@ sysace_send_config(struct ace_softc *sc,
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/emips/ebus/flash_ebus.c
diff -u src/sys/arch/emips/ebus/flash_ebus.c:1.20.8.1 src/sys/arch/emips/ebus/flash_ebus.c:1.20.8.2
--- src/sys/arch/emips/ebus/flash_ebus.c:1.20.8.1 Sun Dec 8 14:43:16 2019
+++ src/sys/arch/emips/ebus/flash_ebus.c Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: flash_ebus.c,v 1.20.8.1 2019/12/08 14:43:16 martin Exp $ */
+/* $NetBSD: flash_ebus.c,v 1.20.8.2 2019/12/18 20:04:33 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.20.8.1 2019/12/08 14:43:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.20.8.2 2019/12/18 20:04:33 martin Exp $");
/* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device
* Extended to include the Intel JS28F256P30T95.
@@ -1341,13 +1341,6 @@ static int eflash_write_at (struct eflas
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/emips/emips/bus_space.c
diff -u src/sys/arch/emips/emips/bus_space.c:1.2 src/sys/arch/emips/emips/bus_space.c:1.2.52.1
--- src/sys/arch/emips/emips/bus_space.c:1.2 Sun Feb 12 16:34:07 2012
+++ src/sys/arch/emips/emips/bus_space.c Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.2 2012/02/12 16:34:07 matt Exp $ */
+/* $NetBSD: bus_space.c,v 1.2.52.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -42,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.2 2012/02/12 16:34:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.2.52.1 2019/12/18 20:04:32 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/emips/include/loadfile_machdep.h
diff -u src/sys/arch/emips/include/loadfile_machdep.h:1.2 src/sys/arch/emips/include/loadfile_machdep.h:1.2.32.1
--- src/sys/arch/emips/include/loadfile_machdep.h:1.2 Wed Aug 6 21:57:49 2014
+++ src/sys/arch/emips/include/loadfile_machdep.h Wed Dec 18 20:04:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.2 2014/08/06 21:57:49 joerg Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.2.32.1 2019/12/18 20:04:34 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/emips/stand/common/bootinfo.c
diff -u src/sys/arch/emips/stand/common/bootinfo.c:1.1 src/sys/arch/emips/stand/common/bootinfo.c:1.1.66.1
--- src/sys/arch/emips/stand/common/bootinfo.c:1.1 Wed Jan 26 01:18:54 2011
+++ src/sys/arch/emips/stand/common/bootinfo.c Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.c,v 1.1 2011/01/26 01:18:54 pooka Exp $ */
+/* $NetBSD: bootinfo.c,v 1.1.66.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/emips/stand/common/bootinfo.h
diff -u src/sys/arch/emips/stand/common/bootinfo.h:1.1 src/sys/arch/emips/stand/common/bootinfo.h:1.1.66.1
--- src/sys/arch/emips/stand/common/bootinfo.h:1.1 Wed Jan 26 01:18:54 2011
+++ src/sys/arch/emips/stand/common/bootinfo.h Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.h,v 1.1 2011/01/26 01:18:54 pooka Exp $ */
+/* $NetBSD: bootinfo.h,v 1.1.66.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/emips/stand/common/bootxx.c
diff -u src/sys/arch/emips/stand/common/bootxx.c:1.1 src/sys/arch/emips/stand/common/bootxx.c:1.1.66.1
--- src/sys/arch/emips/stand/common/bootxx.c:1.1 Wed Jan 26 01:18:54 2011
+++ src/sys/arch/emips/stand/common/bootxx.c Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxx.c,v 1.1 2011/01/26 01:18:54 pooka Exp $ */
+/* $NetBSD: bootxx.c,v 1.1.66.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/emips/stand/common/prom_iface.c
diff -u src/sys/arch/emips/stand/common/prom_iface.c:1.6 src/sys/arch/emips/stand/common/prom_iface.c:1.6.22.1
--- src/sys/arch/emips/stand/common/prom_iface.c:1.6 Sat Mar 12 02:13:35 2016
+++ src/sys/arch/emips/stand/common/prom_iface.c Wed Dec 18 20:04:32 2019
@@ -11,13 +11,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm
diff -u src/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm:1.1 src/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm:1.1.70.1
--- src/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm:1.1 Tue Apr 6 16:20:28 2010
+++ src/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-; $NetBSD: arm_pxa2x0_asm.asm,v 1.1 2010/04/06 16:20:28 nonaka Exp $
+; $NetBSD: arm_pxa2x0_asm.asm,v 1.1.70.1 2019/12/18 20:04:33 martin Exp $
;
; Copyright (c) 2001 The NetBSD Foundation, Inc.
; All rights reserved.
@@ -14,13 +14,6 @@
; 2. Redistributions in binary form must reproduce the above copyright
; notice, this list of conditions and the following disclaimer in the
; documentation and/or other materials provided with the distribution.
-; 3. All advertising materials mentioning features or use of this software
-; must display the following acknowledgement:
-; This product includes software developed by the NetBSD
-; Foundation, Inc. and its contributors.
-; 4. Neither the name of The NetBSD Foundation nor the names of its
-; contributors may be used to endorse or promote products derived
-; from this software without specific prior written permission.
;
; THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
; ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm
diff -u src/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm:1.1 src/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm:1.1.70.1
--- src/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm:1.1 Tue Apr 6 16:20:28 2010
+++ src/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-; $NetBSD: arm_sa1100_asm.asm,v 1.1 2010/04/06 16:20:28 nonaka Exp $
+; $NetBSD: arm_sa1100_asm.asm,v 1.1.70.1 2019/12/18 20:04:33 martin Exp $
;
; Copyright (c) 2001 The NetBSD Foundation, Inc.
; All rights reserved.
@@ -14,13 +14,6 @@
; 2. Redistributions in binary form must reproduce the above copyright
; notice, this list of conditions and the following disclaimer in the
; documentation and/or other materials provided with the distribution.
-; 3. All advertising materials mentioning features or use of this software
-; must display the following acknowledgement:
-; This product includes software developed by the NetBSD
-; Foundation, Inc. and its contributors.
-; 4. Neither the name of The NetBSD Foundation nor the names of its
-; contributors may be used to endorse or promote products derived
-; from this software without specific prior written permission.
;
; THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
; ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/hpcarm/include/kloader.h
diff -u src/sys/arch/hpcarm/include/kloader.h:1.2 src/sys/arch/hpcarm/include/kloader.h:1.2.22.1
--- src/sys/arch/hpcarm/include/kloader.h:1.2 Thu Jun 11 08:14:38 2015
+++ src/sys/arch/hpcarm/include/kloader.h Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader.h,v 1.2 2015/06/11 08:14:38 matt Exp $ */
+/* $NetBSD: kloader.h,v 1.2.22.1 2019/12/18 20:04:33 martin Exp $ */
/*-
* Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -12,13 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/ia64/ia64/bus_space.c
diff -u src/sys/arch/ia64/ia64/bus_space.c:1.1 src/sys/arch/ia64/ia64/bus_space.c:1.1.70.1
--- src/sys/arch/ia64/ia64/bus_space.c:1.1 Mon Jul 20 04:41:36 2009
+++ src/sys/arch/ia64/ia64/bus_space.c Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.1 2009/07/20 04:41:36 kiyohara Exp $ */
+/* $NetBSD: bus_space.c,v 1.1.70.1 2019/12/18 20:04:33 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -38,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.1 2009/07/20 04:41:36 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.1.70.1 2019/12/18 20:04:33 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/ia64/include/bus.h
diff -u src/sys/arch/ia64/include/bus.h:1.2 src/sys/arch/ia64/include/bus.h:1.2.20.1
--- src/sys/arch/ia64/include/bus.h:1.2 Thu Sep 15 21:45:37 2016
+++ src/sys/arch/ia64/include/bus.h Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.2 2016/09/15 21:45:37 jdolecek Exp $ */
+/* $NetBSD: bus.h,v 1.2.20.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/mips/cavium/octeon_dma.c
diff -u src/sys/arch/mips/cavium/octeon_dma.c:1.2 src/sys/arch/mips/cavium/octeon_dma.c:1.2.24.1
--- src/sys/arch/mips/cavium/octeon_dma.c:1.2 Mon Jul 11 16:15:35 2016
+++ src/sys/arch/mips/cavium/octeon_dma.c Wed Dec 18 20:04:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_dma.c,v 1.2 2016/07/11 16:15:35 matt Exp $ */
+/* $NetBSD: octeon_dma.c,v 1.2.24.1 2019/12/18 20:04:34 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -41,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_dma.c,v 1.2 2016/07/11 16:15:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_dma.c,v 1.2.24.1 2019/12/18 20:04:34 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/x68k/dev/intiovar.h
diff -u src/sys/arch/x68k/dev/intiovar.h:1.14 src/sys/arch/x68k/dev/intiovar.h:1.14.42.1
--- src/sys/arch/x68k/dev/intiovar.h:1.14 Tue Jan 22 11:58:39 2013
+++ src/sys/arch/x68k/dev/intiovar.h Wed Dec 18 20:04:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intiovar.h,v 1.14 2013/01/22 11:58:39 isaki Exp $ */
+/* $NetBSD: intiovar.h,v 1.14.42.1 2019/12/18 20:04:34 martin Exp $ */
/*
*
@@ -13,12 +13,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/x68k/dev/mfp.c
diff -u src/sys/arch/x68k/dev/mfp.c:1.26 src/sys/arch/x68k/dev/mfp.c:1.26.34.1
--- src/sys/arch/x68k/dev/mfp.c:1.26 Wed Mar 26 08:17:59 2014
+++ src/sys/arch/x68k/dev/mfp.c Wed Dec 18 20:04:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mfp.c,v 1.26 2014/03/26 08:17:59 christos Exp $ */
+/* $NetBSD: mfp.c,v 1.26.34.1 2019/12/18 20:04:34 martin Exp $ */
/*-
* Copyright (c) 1998 NetBSD Foundation, Inc.
@@ -12,12 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -42,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.26 2014/03/26 08:17:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.26.34.1 2019/12/18 20:04:34 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/zaurus/include/kloader.h
diff -u src/sys/arch/zaurus/include/kloader.h:1.2 src/sys/arch/zaurus/include/kloader.h:1.2.22.1
--- src/sys/arch/zaurus/include/kloader.h:1.2 Thu Jun 11 15:11:14 2015
+++ src/sys/arch/zaurus/include/kloader.h Wed Dec 18 20:04:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader.h,v 1.2 2015/06/11 15:11:14 matt Exp $ */
+/* $NetBSD: kloader.h,v 1.2.22.1 2019/12/18 20:04:34 martin Exp $ */
/*-
* Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -12,13 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/compat/common/kern_time_30.c
diff -u src/sys/compat/common/kern_time_30.c:1.7 src/sys/compat/common/kern_time_30.c:1.7.4.1
--- src/sys/compat/common/kern_time_30.c:1.7 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/kern_time_30.c Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time_30.c,v 1.7 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: kern_time_30.c,v 1.7.4.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -36,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time_30.c,v 1.7 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time_30.c,v 1.7.4.1 2019/12/18 20:04:32 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
Index: src/sys/compat/common/sysv_msg_50.c
diff -u src/sys/compat/common/sysv_msg_50.c:1.4 src/sys/compat/common/sysv_msg_50.c:1.4.4.1
--- src/sys/compat/common/sysv_msg_50.c:1.4 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/sysv_msg_50.c Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_msg_50.c,v 1.4 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: sysv_msg_50.c,v 1.4.4.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -38,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysv_msg_50.c,v 1.4 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_msg_50.c,v 1.4.4.1 2019/12/18 20:04:32 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
Index: src/sys/compat/common/sysv_sem_50.c
diff -u src/sys/compat/common/sysv_sem_50.c:1.4 src/sys/compat/common/sysv_sem_50.c:1.4.4.1
--- src/sys/compat/common/sysv_sem_50.c:1.4 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/sysv_sem_50.c Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_sem_50.c,v 1.4 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: sysv_sem_50.c,v 1.4.4.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -38,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysv_sem_50.c,v 1.4 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_sem_50.c,v 1.4.4.1 2019/12/18 20:04:32 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
Index: src/sys/compat/common/sysv_shm_50.c
diff -u src/sys/compat/common/sysv_shm_50.c:1.4 src/sys/compat/common/sysv_shm_50.c:1.4.4.1
--- src/sys/compat/common/sysv_shm_50.c:1.4 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/sysv_shm_50.c Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_shm_50.c,v 1.4 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: sysv_shm_50.c,v 1.4.4.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -38,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysv_shm_50.c,v 1.4 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_shm_50.c,v 1.4.4.1 2019/12/18 20:04:32 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
Index: src/sys/compat/common/uipc_syscalls_50.c
diff -u src/sys/compat/common/uipc_syscalls_50.c:1.8 src/sys/compat/common/uipc_syscalls_50.c:1.8.4.1
--- src/sys/compat/common/uipc_syscalls_50.c:1.8 Fri Mar 1 11:06:56 2019
+++ src/sys/compat/common/uipc_syscalls_50.c Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls_50.c,v 1.8 2019/03/01 11:06:56 pgoyette Exp $ */
+/* $NetBSD: uipc_syscalls_50.c,v 1.8.4.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/compat/common/vfs_syscalls_50.c
diff -u src/sys/compat/common/vfs_syscalls_50.c:1.23 src/sys/compat/common/vfs_syscalls_50.c:1.23.2.1
--- src/sys/compat/common/vfs_syscalls_50.c:1.23 Tue Jun 18 22:34:25 2019
+++ src/sys/compat/common/vfs_syscalls_50.c Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_50.c,v 1.23 2019/06/18 22:34:25 kamil Exp $ */
+/* $NetBSD: vfs_syscalls_50.c,v 1.23.2.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -36,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_50.c,v 1.23 2019/06/18 22:34:25 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_50.c,v 1.23.2.1 2019/12/18 20:04:32 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
Index: src/sys/compat/net/if.h
diff -u src/sys/compat/net/if.h:1.4 src/sys/compat/net/if.h:1.4.20.1
--- src/sys/compat/net/if.h:1.4 Wed Sep 21 10:50:23 2016
+++ src/sys/compat/net/if.h Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.4 2016/09/21 10:50:23 roy Exp $ */
+/* $NetBSD: if.h,v 1.4.20.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/compat/netbsd32/netbsd32_compat_16.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_16.c:1.2 src/sys/compat/netbsd32/netbsd32_compat_16.c:1.2.6.1
--- src/sys/compat/netbsd32/netbsd32_compat_16.c:1.2 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_16.c Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_16.c,v 1.2 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_16.c,v 1.2.6.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -36,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_16.c,v 1.2 2019/01/27 02:08:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_16.c,v 1.2.6.1 2019/12/18 20:04:32 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.39 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.39.2.1
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.39 Thu Jun 27 02:36:27 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.39 2019/06/27 02:36:27 christos Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.39.2.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -36,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.39 2019/06/27 02:36:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.39.2.1 2019/12/18 20:04:32 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
Index: src/sys/compat/netbsd32/netbsd32_compat_50_sysv.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50_sysv.c:1.2 src/sys/compat/netbsd32/netbsd32_compat_50_sysv.c:1.2.4.1
--- src/sys/compat/netbsd32/netbsd32_compat_50_sysv.c:1.2 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_50_sysv.c Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50_sysv.c,v 1.2 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_50_sysv.c,v 1.2.4.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -36,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50_sysv.c,v 1.2 2019/01/27 02:08:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50_sysv.c,v 1.2.4.1 2019/12/18 20:04:32 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
Index: src/sys/compat/netbsd32/netbsd32_compat_60.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_60.c:1.4 src/sys/compat/netbsd32/netbsd32_compat_60.c:1.4.4.1
--- src/sys/compat/netbsd32/netbsd32_compat_60.c:1.4 Sun Jan 27 02:08:40 2019
+++ src/sys/compat/netbsd32/netbsd32_compat_60.c Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_60.c,v 1.4 2019/01/27 02:08:40 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_60.c,v 1.4.4.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -36,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.4 2019/01/27 02:08:40 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.4.4.1 2019/12/18 20:04:32 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/compat/netinet6/in6_var.h
diff -u src/sys/compat/netinet6/in6_var.h:1.4 src/sys/compat/netinet6/in6_var.h:1.4.6.1
--- src/sys/compat/netinet6/in6_var.h:1.4 Thu Apr 19 21:50:08 2018
+++ src/sys/compat/netinet6/in6_var.h Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_var.h,v 1.4 2018/04/19 21:50:08 christos Exp $ */
+/* $NetBSD: in6_var.h,v 1.4.6.1 2019/12/18 20:04:33 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/compat/ultrix/ultrix_exec.h
diff -u src/sys/compat/ultrix/ultrix_exec.h:1.6 src/sys/compat/ultrix/ultrix_exec.h:1.6.72.1
--- src/sys/compat/ultrix/ultrix_exec.h:1.6 Wed Nov 19 18:36:06 2008
+++ src/sys/compat/ultrix/ultrix_exec.h Wed Dec 18 20:04:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_exec.h,v 1.6 2008/11/19 18:36:06 ad Exp $ */
+/* $NetBSD: ultrix_exec.h,v 1.6.72.1 2019/12/18 20:04:34 martin Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -12,12 +12,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
Index: src/sys/dev/ic/adv.c
diff -u src/sys/dev/ic/adv.c:1.48 src/sys/dev/ic/adv.c:1.48.6.1
--- src/sys/dev/ic/adv.c:1.48 Wed Aug 29 16:51:51 2018
+++ src/sys/dev/ic/adv.c Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: adv.c,v 1.48 2018/08/29 16:51:51 rin Exp $ */
+/* $NetBSD: adv.c,v 1.48.6.1 2019/12/18 20:04:33 martin Exp $ */
/*
* Generic driver for the Advanced Systems Inc. Narrow SCSI controllers
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -38,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.48 2018/08/29 16:51:51 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.48.6.1 2019/12/18 20:04:33 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/ic/adv.h
diff -u src/sys/dev/ic/adv.h:1.13 src/sys/dev/ic/adv.h:1.13.170.1
--- src/sys/dev/ic/adv.h:1.13 Sun Dec 11 12:21:25 2005
+++ src/sys/dev/ic/adv.h Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: adv.h,v 1.13 2005/12/11 12:21:25 christos Exp $ */
+/* $NetBSD: adv.h,v 1.13.170.1 2019/12/18 20:04:33 martin Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
@@ -17,13 +17,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/dev/ic/advlib.c
diff -u src/sys/dev/ic/advlib.c:1.27 src/sys/dev/ic/advlib.c:1.27.66.1
--- src/sys/dev/ic/advlib.c:1.27 Sat Nov 13 13:52:00 2010
+++ src/sys/dev/ic/advlib.c Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: advlib.c,v 1.27 2010/11/13 13:52:00 uebayasi Exp $ */
+/* $NetBSD: advlib.c,v 1.27.66.1 2019/12/18 20:04:33 martin Exp $ */
/*
* Low level routines for the Advanced Systems Inc. SCSI controllers chips
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -53,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advlib.c,v 1.27 2010/11/13 13:52:00 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advlib.c,v 1.27.66.1 2019/12/18 20:04:33 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/ic/advlib.h
diff -u src/sys/dev/ic/advlib.h:1.19 src/sys/dev/ic/advlib.h:1.19.44.1
--- src/sys/dev/ic/advlib.h:1.19 Sat Oct 27 17:18:18 2012
+++ src/sys/dev/ic/advlib.h Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: advlib.h,v 1.19 2012/10/27 17:18:18 chs Exp $ */
+/* $NetBSD: advlib.h,v 1.19.44.1 2019/12/18 20:04:33 martin Exp $ */
/*
* Definitions for low level routines and data structures
@@ -17,13 +17,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/dev/ic/advmcode.c
diff -u src/sys/dev/ic/advmcode.c:1.9 src/sys/dev/ic/advmcode.c:1.9.170.1
--- src/sys/dev/ic/advmcode.c:1.9 Sun Dec 11 12:21:25 2005
+++ src/sys/dev/ic/advmcode.c Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: advmcode.c,v 1.9 2005/12/11 12:21:25 christos Exp $ */
+/* $NetBSD: advmcode.c,v 1.9.170.1 2019/12/18 20:04:33 martin Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
@@ -17,13 +17,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -55,7 +48,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advmcode.c,v 1.9 2005/12/11 12:21:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advmcode.c,v 1.9.170.1 2019/12/18 20:04:33 martin Exp $");
#include <sys/param.h>
Index: src/sys/dev/ic/advmcode.h
diff -u src/sys/dev/ic/advmcode.h:1.6 src/sys/dev/ic/advmcode.h:1.6.170.1
--- src/sys/dev/ic/advmcode.h:1.6 Sun Dec 11 12:21:25 2005
+++ src/sys/dev/ic/advmcode.h Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: advmcode.h,v 1.6 2005/12/11 12:21:25 christos Exp $ */
+/* $NetBSD: advmcode.h,v 1.6.170.1 2019/12/18 20:04:33 martin Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
@@ -17,13 +17,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/dev/ic/adw.c
diff -u src/sys/dev/ic/adw.c:1.54 src/sys/dev/ic/adw.c:1.54.24.1
--- src/sys/dev/ic/adw.c:1.54 Thu Jul 14 04:19:26 2016
+++ src/sys/dev/ic/adw.c Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: adw.c,v 1.54 2016/07/14 04:19:26 msaitoh Exp $ */
+/* $NetBSD: adw.c,v 1.54.24.1 2019/12/18 20:04:33 martin Exp $ */
/*
* Generic driver for the Advanced Systems Inc. SCSI controllers
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -38,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.54 2016/07/14 04:19:26 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.54.24.1 2019/12/18 20:04:33 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/ic/adw.h
diff -u src/sys/dev/ic/adw.h:1.14 src/sys/dev/ic/adw.h:1.14.170.1
--- src/sys/dev/ic/adw.h:1.14 Sun Dec 11 12:21:25 2005
+++ src/sys/dev/ic/adw.h Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: adw.h,v 1.14 2005/12/11 12:21:25 christos Exp $ */
+/* $NetBSD: adw.h,v 1.14.170.1 2019/12/18 20:04:33 martin Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
@@ -17,13 +17,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/dev/ic/adwlib.c
diff -u src/sys/dev/ic/adwlib.c:1.42 src/sys/dev/ic/adwlib.c:1.42.4.1
--- src/sys/dev/ic/adwlib.c:1.42 Sun Feb 3 03:19:27 2019
+++ src/sys/dev/ic/adwlib.c Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: adwlib.c,v 1.42 2019/02/03 03:19:27 mrg Exp $ */
+/* $NetBSD: adwlib.c,v 1.42.4.1 2019/12/18 20:04:33 martin Exp $ */
/*
* Low level routines for the Advanced Systems Inc. SCSI controllers chips
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -52,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.42 2019/02/03 03:19:27 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.42.4.1 2019/12/18 20:04:33 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/ic/adwlib.h
diff -u src/sys/dev/ic/adwlib.h:1.21 src/sys/dev/ic/adwlib.h:1.21.44.1
--- src/sys/dev/ic/adwlib.h:1.21 Sat Oct 27 17:18:18 2012
+++ src/sys/dev/ic/adwlib.h Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: adwlib.h,v 1.21 2012/10/27 17:18:18 chs Exp $ */
+/* $NetBSD: adwlib.h,v 1.21.44.1 2019/12/18 20:04:33 martin Exp $ */
/*
* Definitions for low level routines and data structures
@@ -17,13 +17,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/dev/ic/adwmcode.c
diff -u src/sys/dev/ic/adwmcode.c:1.17 src/sys/dev/ic/adwmcode.c:1.17.70.1
--- src/sys/dev/ic/adwmcode.c:1.17 Mon Nov 23 02:13:46 2009
+++ src/sys/dev/ic/adwmcode.c Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: adwmcode.c,v 1.17 2009/11/23 02:13:46 rmind Exp $ */
+/* $NetBSD: adwmcode.c,v 1.17.70.1 2019/12/18 20:04:33 martin Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
@@ -17,13 +17,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -54,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adwmcode.c,v 1.17 2009/11/23 02:13:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adwmcode.c,v 1.17.70.1 2019/12/18 20:04:33 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/ic/adwmcode.h
diff -u src/sys/dev/ic/adwmcode.h:1.11 src/sys/dev/ic/adwmcode.h:1.11.170.1
--- src/sys/dev/ic/adwmcode.h:1.11 Sun Dec 11 12:21:25 2005
+++ src/sys/dev/ic/adwmcode.h Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: adwmcode.h,v 1.11 2005/12/11 12:21:25 christos Exp $ */
+/* $NetBSD: adwmcode.h,v 1.11.170.1 2019/12/18 20:04:33 martin Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
@@ -17,13 +17,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/dev/raidframe/rf_compat50.c
diff -u src/sys/dev/raidframe/rf_compat50.c:1.10 src/sys/dev/raidframe/rf_compat50.c:1.10.4.1
--- src/sys/dev/raidframe/rf_compat50.c:1.10 Fri Mar 1 11:06:56 2019
+++ src/sys/dev/raidframe/rf_compat50.c Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat50.c,v 1.10 2019/03/01 11:06:56 pgoyette Exp $ */
+/* $NetBSD: rf_compat50.c,v 1.10.4.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/dev/raidframe/rf_compat50.h
diff -u src/sys/dev/raidframe/rf_compat50.h:1.5 src/sys/dev/raidframe/rf_compat50.h:1.5.4.1
--- src/sys/dev/raidframe/rf_compat50.h:1.5 Tue Feb 5 23:28:02 2019
+++ src/sys/dev/raidframe/rf_compat50.h Wed Dec 18 20:04:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_compat50.h,v 1.5 2019/02/05 23:28:02 christos Exp $ */
+/* $NetBSD: rf_compat50.h,v 1.5.4.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/dev/usb/uberry.c
diff -u src/sys/dev/usb/uberry.c:1.14 src/sys/dev/usb/uberry.c:1.14.2.1
--- src/sys/dev/usb/uberry.c:1.14 Sun May 5 03:17:54 2019
+++ src/sys/dev/usb/uberry.c Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uberry.c,v 1.14 2019/05/05 03:17:54 mrg Exp $ */
+/* $NetBSD: uberry.c,v 1.14.2.1 2019/12/18 20:04:33 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific pberryr written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -37,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.14 2019/05/05 03:17:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.14.2.1 2019/12/18 20:04:33 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
Index: src/sys/dev/usb/uipad.c
diff -u src/sys/dev/usb/uipad.c:1.7 src/sys/dev/usb/uipad.c:1.7.2.1
--- src/sys/dev/usb/uipad.c:1.7 Sun May 5 03:17:54 2019
+++ src/sys/dev/usb/uipad.c Wed Dec 18 20:04:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipad.c,v 1.7 2019/05/05 03:17:54 mrg Exp $ */
+/* $NetBSD: uipad.c,v 1.7.2.1 2019/12/18 20:04:33 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific pipadr written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -37,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipad.c,v 1.7 2019/05/05 03:17:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipad.c,v 1.7.2.1 2019/12/18 20:04:33 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
