From c2eda0eb8fe78f1e2506a4e662fe5dd38a800793 Mon Sep 17 00:00:00 2001 From: martin Date: Wed, 18 Dec 2019 20:04:32 +0000 Subject: [PATCH] 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. --- sys/arch/amigappc/include/intr.h | 9 +-------- sys/arch/arm/at91/at91dbgu.c | 13 +++---------- sys/arch/emips/ebus/ace_ebus.c | 11 ++--------- sys/arch/emips/ebus/flash_ebus.c | 11 ++--------- sys/arch/emips/emips/bus_space.c | 11 ++--------- sys/arch/emips/include/loadfile_machdep.h | 9 +-------- sys/arch/emips/stand/common/bootinfo.c | 9 +-------- sys/arch/emips/stand/common/bootinfo.h | 9 +-------- sys/arch/emips/stand/common/bootxx.c | 9 +-------- sys/arch/emips/stand/common/prom_iface.c | 7 ------- sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm | 9 +-------- sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm | 9 +-------- sys/arch/hpcarm/include/kloader.h | 9 +-------- sys/arch/ia64/ia64/bus_space.c | 11 ++--------- sys/arch/ia64/include/bus.h | 9 +-------- sys/arch/mips/cavium/octeon_dma.c | 11 ++--------- sys/arch/x68k/dev/intiovar.h | 8 +------- sys/arch/x68k/dev/mfp.c | 10 ++-------- sys/arch/zaurus/include/kloader.h | 9 +-------- sys/compat/common/kern_time_30.c | 11 ++--------- sys/compat/common/sysv_msg_50.c | 11 ++--------- sys/compat/common/sysv_sem_50.c | 11 ++--------- sys/compat/common/sysv_shm_50.c | 11 ++--------- sys/compat/common/uipc_syscalls_50.c | 9 +-------- sys/compat/common/vfs_syscalls_50.c | 11 ++--------- sys/compat/net/if.h | 9 +-------- sys/compat/netbsd32/netbsd32_compat_16.c | 11 ++--------- sys/compat/netbsd32/netbsd32_compat_50.c | 11 ++--------- sys/compat/netbsd32/netbsd32_compat_50_sysv.c | 11 ++--------- sys/compat/netbsd32/netbsd32_compat_60.c | 11 ++--------- sys/compat/netinet6/in6_var.h | 9 +-------- sys/compat/ultrix/ultrix_exec.h | 8 +------- sys/dev/ic/adv.c | 11 ++--------- sys/dev/ic/adv.h | 9 +-------- sys/dev/ic/advlib.c | 11 ++--------- sys/dev/ic/advlib.h | 9 +-------- sys/dev/ic/advmcode.c | 11 ++--------- sys/dev/ic/advmcode.h | 9 +-------- sys/dev/ic/adw.c | 11 ++--------- sys/dev/ic/adw.h | 9 +-------- sys/dev/ic/adwlib.c | 11 ++--------- sys/dev/ic/adwlib.h | 9 +-------- sys/dev/ic/adwmcode.c | 11 ++--------- sys/dev/ic/adwmcode.h | 9 +-------- sys/dev/raidframe/rf_compat50.c | 9 +-------- sys/dev/raidframe/rf_compat50.h | 9 +-------- sys/dev/usb/uberry.c | 11 ++--------- sys/dev/usb/uipad.c | 11 ++--------- 48 files changed, 72 insertions(+), 405 deletions(-) diff --git a/sys/arch/amigappc/include/intr.h b/sys/arch/amigappc/include/intr.h index 6aaa1183bf3c..483361171805 100644 --- a/sys/arch/amigappc/include/intr.h +++ b/sys/arch/amigappc/include/intr.h @@ -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 diff --git a/sys/arch/arm/at91/at91dbgu.c b/sys/arch/arm/at91/at91dbgu.c index 4c75970a55af..bdd28508105e 100644 --- a/sys/arch/arm/at91/at91dbgu.c +++ b/sys/arch/arm/at91/at91dbgu.c @@ -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 -__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" diff --git a/sys/arch/emips/ebus/ace_ebus.c b/sys/arch/emips/ebus/ace_ebus.c index 547d01917fd9..d1a218f7dd60 100644 --- a/sys/arch/emips/ebus/ace_ebus.c +++ b/sys/arch/emips/ebus/ace_ebus.c @@ -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 -__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 #include @@ -1501,13 +1501,6 @@ sysace_send_config(struct ace_softc *sc, uint32_t *Data, unsigned int nBytes) * 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 diff --git a/sys/arch/emips/ebus/flash_ebus.c b/sys/arch/emips/ebus/flash_ebus.c index ebf08087137a..cbecf9d56eb9 100644 --- a/sys/arch/emips/ebus/flash_ebus.c +++ b/sys/arch/emips/ebus/flash_ebus.c @@ -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 /* 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 eflash_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 diff --git a/sys/arch/emips/emips/bus_space.c b/sys/arch/emips/emips/bus_space.c index 4ca7b825a5d9..fadbb932289c 100644 --- a/sys/arch/emips/emips/bus_space.c +++ b/sys/arch/emips/emips/bus_space.c @@ -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 -__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 #include diff --git a/sys/arch/emips/include/loadfile_machdep.h b/sys/arch/emips/include/loadfile_machdep.h index 18d5ab8db5a2..5c8073dad99b 100644 --- a/sys/arch/emips/include/loadfile_machdep.h +++ b/sys/arch/emips/include/loadfile_machdep.h @@ -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 diff --git a/sys/arch/emips/stand/common/bootinfo.c b/sys/arch/emips/stand/common/bootinfo.c index 97235b7b5264..b23b3b1ef1fa 100644 --- a/sys/arch/emips/stand/common/bootinfo.c +++ b/sys/arch/emips/stand/common/bootinfo.c @@ -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 diff --git a/sys/arch/emips/stand/common/bootinfo.h b/sys/arch/emips/stand/common/bootinfo.h index a92daea02fda..4db879c8c23e 100644 --- a/sys/arch/emips/stand/common/bootinfo.h +++ b/sys/arch/emips/stand/common/bootinfo.h @@ -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 diff --git a/sys/arch/emips/stand/common/bootxx.c b/sys/arch/emips/stand/common/bootxx.c index 1d1a8a46439f..170bc4e8658b 100644 --- a/sys/arch/emips/stand/common/bootxx.c +++ b/sys/arch/emips/stand/common/bootxx.c @@ -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 diff --git a/sys/arch/emips/stand/common/prom_iface.c b/sys/arch/emips/stand/common/prom_iface.c index 3c07639c016f..70663e72622d 100644 --- a/sys/arch/emips/stand/common/prom_iface.c +++ b/sys/arch/emips/stand/common/prom_iface.c @@ -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 diff --git a/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm b/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm index 0e5e4851334a..52fab84ff5e2 100644 --- a/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm +++ b/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm @@ -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 diff --git a/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm b/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm index ba07a61b0f5b..4ce3bee32550 100644 --- a/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm +++ b/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm @@ -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 diff --git a/sys/arch/hpcarm/include/kloader.h b/sys/arch/hpcarm/include/kloader.h index eca5053609fe..3ec3fffc6343 100644 --- a/sys/arch/hpcarm/include/kloader.h +++ b/sys/arch/hpcarm/include/kloader.h @@ -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 diff --git a/sys/arch/ia64/ia64/bus_space.c b/sys/arch/ia64/ia64/bus_space.c index 86eea09e2500..567703d36211 100644 --- a/sys/arch/ia64/ia64/bus_space.c +++ b/sys/arch/ia64/ia64/bus_space.c @@ -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 -__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 #include diff --git a/sys/arch/ia64/include/bus.h b/sys/arch/ia64/include/bus.h index 964b4a0760cd..e11c22256ae5 100644 --- a/sys/arch/ia64/include/bus.h +++ b/sys/arch/ia64/include/bus.h @@ -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 diff --git a/sys/arch/mips/cavium/octeon_dma.c b/sys/arch/mips/cavium/octeon_dma.c index 186fd9e38650..f9cee98fe91f 100644 --- a/sys/arch/mips/cavium/octeon_dma.c +++ b/sys/arch/mips/cavium/octeon_dma.c @@ -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 -__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 #include diff --git a/sys/arch/x68k/dev/intiovar.h b/sys/arch/x68k/dev/intiovar.h index 403882679c3f..5212c686bdfa 100644 --- a/sys/arch/x68k/dev/intiovar.h +++ b/sys/arch/x68k/dev/intiovar.h @@ -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 diff --git a/sys/arch/x68k/dev/mfp.c b/sys/arch/x68k/dev/mfp.c index f1485f1cddff..0f4cb5869e94 100644 --- a/sys/arch/x68k/dev/mfp.c +++ b/sys/arch/x68k/dev/mfp.c @@ -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 -__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 #include diff --git a/sys/arch/zaurus/include/kloader.h b/sys/arch/zaurus/include/kloader.h index 3874a50034cd..6c6c40ee3438 100644 --- a/sys/arch/zaurus/include/kloader.h +++ b/sys/arch/zaurus/include/kloader.h @@ -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 diff --git a/sys/compat/common/kern_time_30.c b/sys/compat/common/kern_time_30.c index 3c43a391e0a8..62a9514b7ac2 100644 --- a/sys/compat/common/kern_time_30.c +++ b/sys/compat/common/kern_time_30.c @@ -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 -__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" diff --git a/sys/compat/common/sysv_msg_50.c b/sys/compat/common/sysv_msg_50.c index bc54d2924a66..6af9b6286e04 100644 --- a/sys/compat/common/sysv_msg_50.c +++ b/sys/compat/common/sysv_msg_50.c @@ -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 -__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" diff --git a/sys/compat/common/sysv_sem_50.c b/sys/compat/common/sysv_sem_50.c index 45488c816185..af926db09b39 100644 --- a/sys/compat/common/sysv_sem_50.c +++ b/sys/compat/common/sysv_sem_50.c @@ -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 -__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" diff --git a/sys/compat/common/sysv_shm_50.c b/sys/compat/common/sysv_shm_50.c index 18129fc4c259..2dd79b42ad0f 100644 --- a/sys/compat/common/sysv_shm_50.c +++ b/sys/compat/common/sysv_shm_50.c @@ -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 -__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" diff --git a/sys/compat/common/uipc_syscalls_50.c b/sys/compat/common/uipc_syscalls_50.c index cf78f70c30bb..540c75ccce31 100644 --- a/sys/compat/common/uipc_syscalls_50.c +++ b/sys/compat/common/uipc_syscalls_50.c @@ -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 diff --git a/sys/compat/common/vfs_syscalls_50.c b/sys/compat/common/vfs_syscalls_50.c index e36535e1e8fb..d1115a401e22 100644 --- a/sys/compat/common/vfs_syscalls_50.c +++ b/sys/compat/common/vfs_syscalls_50.c @@ -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 -__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" diff --git a/sys/compat/net/if.h b/sys/compat/net/if.h index 3f57651dd22f..a62ea717d786 100644 --- a/sys/compat/net/if.h +++ b/sys/compat/net/if.h @@ -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 diff --git a/sys/compat/netbsd32/netbsd32_compat_16.c b/sys/compat/netbsd32/netbsd32_compat_16.c index dc2632682074..e5d61b642f2a 100644 --- a/sys/compat/netbsd32/netbsd32_compat_16.c +++ b/sys/compat/netbsd32/netbsd32_compat_16.c @@ -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 -__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 #include diff --git a/sys/compat/netbsd32/netbsd32_compat_50.c b/sys/compat/netbsd32/netbsd32_compat_50.c index 12fd39a2c136..b59661101a69 100644 --- a/sys/compat/netbsd32/netbsd32_compat_50.c +++ b/sys/compat/netbsd32/netbsd32_compat_50.c @@ -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 -__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" diff --git a/sys/compat/netbsd32/netbsd32_compat_50_sysv.c b/sys/compat/netbsd32/netbsd32_compat_50_sysv.c index afe374b0884f..04ed816ee15b 100644 --- a/sys/compat/netbsd32/netbsd32_compat_50_sysv.c +++ b/sys/compat/netbsd32/netbsd32_compat_50_sysv.c @@ -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 -__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" diff --git a/sys/compat/netbsd32/netbsd32_compat_60.c b/sys/compat/netbsd32/netbsd32_compat_60.c index b5cd850c6489..7f6c13bb959f 100644 --- a/sys/compat/netbsd32/netbsd32_compat_60.c +++ b/sys/compat/netbsd32/netbsd32_compat_60.c @@ -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 -__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 #include diff --git a/sys/compat/netinet6/in6_var.h b/sys/compat/netinet6/in6_var.h index 5d5fbaec9147..ce586b6f05de 100644 --- a/sys/compat/netinet6/in6_var.h +++ b/sys/compat/netinet6/in6_var.h @@ -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 diff --git a/sys/compat/ultrix/ultrix_exec.h b/sys/compat/ultrix/ultrix_exec.h index 91a93d095563..b66c99d62a81 100644 --- a/sys/compat/ultrix/ultrix_exec.h +++ b/sys/compat/ultrix/ultrix_exec.h @@ -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 diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c index e6854ca04d46..d0be59b13290 100644 --- a/sys/dev/ic/adv.c +++ b/sys/dev/ic/adv.c @@ -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 -__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 #include diff --git a/sys/dev/ic/adv.h b/sys/dev/ic/adv.h index d85a8e3a581b..7d9371fa004f 100644 --- a/sys/dev/ic/adv.h +++ b/sys/dev/ic/adv.h @@ -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 diff --git a/sys/dev/ic/advlib.c b/sys/dev/ic/advlib.c index 518d49da5b9d..72e9f9b69a38 100644 --- a/sys/dev/ic/advlib.c +++ b/sys/dev/ic/advlib.c @@ -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 -__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 #include diff --git a/sys/dev/ic/advlib.h b/sys/dev/ic/advlib.h index 3bf9e68c423d..74d90b38b645 100644 --- a/sys/dev/ic/advlib.h +++ b/sys/dev/ic/advlib.h @@ -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 diff --git a/sys/dev/ic/advmcode.c b/sys/dev/ic/advmcode.c index 1608c06fd3ec..07f612afae79 100644 --- a/sys/dev/ic/advmcode.c +++ b/sys/dev/ic/advmcode.c @@ -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 -__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 diff --git a/sys/dev/ic/advmcode.h b/sys/dev/ic/advmcode.h index bab6771db350..117c1f013686 100644 --- a/sys/dev/ic/advmcode.h +++ b/sys/dev/ic/advmcode.h @@ -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 diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c index 6115b207b692..2801737c22c6 100644 --- a/sys/dev/ic/adw.c +++ b/sys/dev/ic/adw.c @@ -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 -__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 #include diff --git a/sys/dev/ic/adw.h b/sys/dev/ic/adw.h index c4fd6a0aa557..c36027e35aab 100644 --- a/sys/dev/ic/adw.h +++ b/sys/dev/ic/adw.h @@ -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 diff --git a/sys/dev/ic/adwlib.c b/sys/dev/ic/adwlib.c index d0e7ace2f6d3..ed592199b09b 100644 --- a/sys/dev/ic/adwlib.c +++ b/sys/dev/ic/adwlib.c @@ -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 -__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 #include diff --git a/sys/dev/ic/adwlib.h b/sys/dev/ic/adwlib.h index 7bbf1d792abf..e9b6004bacba 100644 --- a/sys/dev/ic/adwlib.h +++ b/sys/dev/ic/adwlib.h @@ -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 diff --git a/sys/dev/ic/adwmcode.c b/sys/dev/ic/adwmcode.c index 7af59981db01..8d569988374c 100644 --- a/sys/dev/ic/adwmcode.c +++ b/sys/dev/ic/adwmcode.c @@ -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 -__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 #include diff --git a/sys/dev/ic/adwmcode.h b/sys/dev/ic/adwmcode.h index 1904d71f2076..d944727c55d1 100644 --- a/sys/dev/ic/adwmcode.h +++ b/sys/dev/ic/adwmcode.h @@ -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 diff --git a/sys/dev/raidframe/rf_compat50.c b/sys/dev/raidframe/rf_compat50.c index 9a452aab518e..12e2fd5f8313 100644 --- a/sys/dev/raidframe/rf_compat50.c +++ b/sys/dev/raidframe/rf_compat50.c @@ -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 diff --git a/sys/dev/raidframe/rf_compat50.h b/sys/dev/raidframe/rf_compat50.h index 6677553d4a2c..c767533b94b9 100644 --- a/sys/dev/raidframe/rf_compat50.h +++ b/sys/dev/raidframe/rf_compat50.h @@ -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 diff --git a/sys/dev/usb/uberry.c b/sys/dev/usb/uberry.c index f497886273c2..91709bf9377e 100644 --- a/sys/dev/usb/uberry.c +++ b/sys/dev/usb/uberry.c @@ -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 -__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" diff --git a/sys/dev/usb/uipad.c b/sys/dev/usb/uipad.c index e46a96967dff..a92b544dc9e8 100644 --- a/sys/dev/usb/uipad.c +++ b/sys/dev/usb/uipad.c @@ -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 -__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"