[src/trunk]: src/sys/arch/emips Remove clause 3 and 4 from TNF licenses.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/emips Remove clause 3 and 4 from TNF licenses.
From: tsutsui <tsutsui%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 13:38:42 +0000
details:   https://anonhg.NetBSD.org/src/rev/118feab1e52a
branches:  trunk
changeset: 847172:118feab1e52a
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Dec 14 02:58:19 2019 +0000

description:
Remove clause 3 and 4 from TNF licenses.

Ok'ed by martin@ in PR/54760.

diffstat:

 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 -------
 8 files changed, 10 insertions(+), 66 deletions(-)

diffs (205 lines):

diff -r 3071cf9e5a77 -r 118feab1e52a sys/arch/emips/ebus/ace_ebus.c
--- a/sys/arch/emips/ebus/ace_ebus.c    Fri Dec 13 23:01:41 2019 +0000
+++ b/sys/arch/emips/ebus/ace_ebus.c    Sat Dec 14 02:58:19 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ace_ebus.c,v 1.21 2019/12/02 19:40:19 bouyer Exp $     */
+/*     $NetBSD: ace_ebus.c,v 1.22 2019/12/14 02:58:19 tsutsui 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.21 2019/12/02 19:40:19 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.22 2019/12/14 02:58:19 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1501,13 +1501,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 -r 3071cf9e5a77 -r 118feab1e52a sys/arch/emips/ebus/flash_ebus.c
--- a/sys/arch/emips/ebus/flash_ebus.c  Fri Dec 13 23:01:41 2019 +0000
+++ b/sys/arch/emips/ebus/flash_ebus.c  Sat Dec 14 02:58:19 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: flash_ebus.c,v 1.21 2019/12/02 19:40:19 bouyer Exp $   */
+/*     $NetBSD: flash_ebus.c,v 1.22 2019/12/14 02:58:19 tsutsui 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.21 2019/12/02 19:40:19 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.22 2019/12/14 02:58:19 tsutsui Exp $");
 
 /* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device
  * Extended to include the Intel JS28F256P30T95.
@@ -1341,13 +1341,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 -r 3071cf9e5a77 -r 118feab1e52a sys/arch/emips/emips/bus_space.c
--- a/sys/arch/emips/emips/bus_space.c  Fri Dec 13 23:01:41 2019 +0000
+++ b/sys/arch/emips/emips/bus_space.c  Sat Dec 14 02:58:19 2019 +0000
@@ -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.3 2019/12/14 02:58:20 tsutsui 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.3 2019/12/14 02:58:20 tsutsui Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 3071cf9e5a77 -r 118feab1e52a sys/arch/emips/include/loadfile_machdep.h
--- a/sys/arch/emips/include/loadfile_machdep.h Fri Dec 13 23:01:41 2019 +0000
+++ b/sys/arch/emips/include/loadfile_machdep.h Sat Dec 14 02:58:19 2019 +0000
@@ -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.3 2019/12/14 02:58:20 tsutsui 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 -r 3071cf9e5a77 -r 118feab1e52a sys/arch/emips/stand/common/bootinfo.c
--- a/sys/arch/emips/stand/common/bootinfo.c    Fri Dec 13 23:01:41 2019 +0000
+++ b/sys/arch/emips/stand/common/bootinfo.c    Sat Dec 14 02:58:19 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootinfo.c,v 1.1 2011/01/26 01:18:54 pooka Exp $       */
+/*     $NetBSD: bootinfo.c,v 1.2 2019/12/14 02:58:20 tsutsui 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 -r 3071cf9e5a77 -r 118feab1e52a sys/arch/emips/stand/common/bootinfo.h
--- a/sys/arch/emips/stand/common/bootinfo.h    Fri Dec 13 23:01:41 2019 +0000
+++ b/sys/arch/emips/stand/common/bootinfo.h    Sat Dec 14 02:58:19 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootinfo.h,v 1.1 2011/01/26 01:18:54 pooka Exp $       */
+/*     $NetBSD: bootinfo.h,v 1.2 2019/12/14 02:58:20 tsutsui 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 -r 3071cf9e5a77 -r 118feab1e52a sys/arch/emips/stand/common/bootxx.c
--- a/sys/arch/emips/stand/common/bootxx.c      Fri Dec 13 23:01:41 2019 +0000
+++ b/sys/arch/emips/stand/common/bootxx.c      Sat Dec 14 02:58:19 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootxx.c,v 1.1 2011/01/26 01:18:54 pooka Exp $ */
+/*     $NetBSD: bootxx.c,v 1.2 2019/12/14 02:58:20 tsutsui 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 -r 3071cf9e5a77 -r 118feab1e52a sys/arch/emips/stand/common/prom_iface.c
--- a/sys/arch/emips/stand/common/prom_iface.c  Fri Dec 13 23:01:41 2019 +0000
+++ b/sys/arch/emips/stand/common/prom_iface.c  Sat Dec 14 02:58:19 2019 +0000
@@ -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
Prev by Date: [src/trunk]: src/sys/dev/pci use FC enable bit for 8842 host port
Next by Date: [src/trunk]: src/external/gpl2/lvm2/dist/libdm/ioctl Handle NULL params, fix ...
Previous by Thread: [src/trunk]: src/sys/dev/pci use FC enable bit for 8842 host port
Next by Thread: [src/trunk]: src/external/gpl2/lvm2/dist/libdm/ioctl Handle NULL params, fix ...
Indexes:
Home | Main Index | Thread Index | Old Index