[src/trunk]: src/sys Remove 3rd and 4th clauses. OK cl@ (copyright holder).

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9bc3d169bf33
branches:  trunk
changeset: 748395:9bc3d169bf33
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Oct 23 02:32:33 2009 +0000

description:
Remove 3rd and 4th clauses.  OK cl@ (copyright holder).

diffstat:

 sys/arch/next68k/dev/bmapreg.h        |  7 +------
 sys/arch/next68k/dev/if_xereg.h       |  7 +------
 sys/arch/xen/i386/npx_hv.c            |  9 ++-------
 sys/arch/xen/include/evtchn.h         |  7 +------
 sys/arch/xen/include/if_xennetvar.h   |  7 +------
 sys/arch/xen/include/kernfs_machdep.h |  7 +------
 sys/arch/xen/include/xbdvar.h         |  7 +------
 sys/arch/xen/include/xenfunc.h        |  7 +------
 sys/arch/xen/include/xenpmap.h        |  7 +------
 sys/arch/xen/x86/hypervisor_machdep.c |  9 ++-------
 sys/arch/xen/x86/x86_xpmap.c          |  9 ++-------
 sys/arch/xen/x86/xenfunc.c            |  9 ++-------
 sys/arch/xen/xen/clock.c              |  9 ++-------
 sys/arch/xen/xen/hypervisor.c         |  9 ++-------
 sys/arch/xen/xen/if_xennet_xenbus.c   |  9 ++-------
 sys/arch/xen/xen/privcmd.c            |  9 ++-------
 sys/arch/xen/xen/xen_debug.c          |  9 ++-------
 sys/arch/xen/xen/xen_machdep.c        |  9 ++-------
 sys/arch/xen/xen/xencons.c            |  9 ++-------
 sys/nfs/nfs_bootstatic.c              |  9 ++-------
 20 files changed, 32 insertions(+), 132 deletions(-)

diffs (truncated from 528 to 300 lines):

diff -r 3c59a887ebbc -r 9bc3d169bf33 sys/arch/next68k/dev/bmapreg.h
--- a/sys/arch/next68k/dev/bmapreg.h    Fri Oct 23 00:39:29 2009 +0000
+++ b/sys/arch/next68k/dev/bmapreg.h    Fri Oct 23 02:32:33 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bmapreg.h,v 1.2 2002/09/11 01:46:30 mycroft Exp $      */
+/*     $NetBSD: bmapreg.h,v 1.3 2009/10/23 02:32:33 snj Exp $  */
 
 /* 
  * Copyright (c) 2002 Christian Limpach
@@ -12,11 +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 Christian Limpach
- * 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 IMPLIED WARRANTIES
diff -r 3c59a887ebbc -r 9bc3d169bf33 sys/arch/next68k/dev/if_xereg.h
--- a/sys/arch/next68k/dev/if_xereg.h   Fri Oct 23 00:39:29 2009 +0000
+++ b/sys/arch/next68k/dev/if_xereg.h   Fri Oct 23 02:32:33 2009 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: if_xereg.h,v 1.1 2002/09/11 01:46:31 mycroft Exp $      */
+/*      $NetBSD: if_xereg.h,v 1.2 2009/10/23 02:32:33 snj Exp $      */
 
 /*
  * Copyright (c) 2002 Christian Limpach
@@ -12,11 +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 Christian Limpach  
- * 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 IMPLIED WARRANTIES  
diff -r 3c59a887ebbc -r 9bc3d169bf33 sys/arch/xen/i386/npx_hv.c
--- a/sys/arch/xen/i386/npx_hv.c        Fri Oct 23 00:39:29 2009 +0000
+++ b/sys/arch/xen/i386/npx_hv.c        Fri Oct 23 02:32:33 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npx_hv.c,v 1.7 2008/10/24 18:02:58 jym Exp $   */
+/*     $NetBSD: npx_hv.c,v 1.8 2009/10/23 02:32:33 snj Exp $   */
 
 /*
  *
@@ -13,11 +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 Christian Limpach.
- * 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 IMPLIED WARRANTIES
@@ -33,7 +28,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npx_hv.c,v 1.7 2008/10/24 18:02:58 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npx_hv.c,v 1.8 2009/10/23 02:32:33 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 3c59a887ebbc -r 9bc3d169bf33 sys/arch/xen/include/evtchn.h
--- a/sys/arch/xen/include/evtchn.h     Fri Oct 23 00:39:29 2009 +0000
+++ b/sys/arch/xen/include/evtchn.h     Fri Oct 23 02:32:33 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: evtchn.h,v 1.17 2008/10/24 21:09:24 jym Exp $  */
+/*     $NetBSD: evtchn.h,v 1.18 2009/10/23 02:32:33 snj Exp $  */
 
 /*
  *
@@ -13,11 +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 Christian Limpach.
- * 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 IMPLIED WARRANTIES
diff -r 3c59a887ebbc -r 9bc3d169bf33 sys/arch/xen/include/if_xennetvar.h
--- a/sys/arch/xen/include/if_xennetvar.h       Fri Oct 23 00:39:29 2009 +0000
+++ b/sys/arch/xen/include/if_xennetvar.h       Fri Oct 23 02:32:33 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_xennetvar.h,v 1.13 2008/04/16 18:41:48 cegger Exp $ */
+/*     $NetBSD: if_xennetvar.h,v 1.14 2009/10/23 02:32:33 snj Exp $    */
 
 /*
  *
@@ -13,11 +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 Christian Limpach.
- * 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 IMPLIED WARRANTIES
diff -r 3c59a887ebbc -r 9bc3d169bf33 sys/arch/xen/include/kernfs_machdep.h
--- a/sys/arch/xen/include/kernfs_machdep.h     Fri Oct 23 00:39:29 2009 +0000
+++ b/sys/arch/xen/include/kernfs_machdep.h     Fri Oct 23 02:32:33 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kernfs_machdep.h,v 1.2 2005/12/11 12:19:48 christos Exp $      */
+/*     $NetBSD: kernfs_machdep.h,v 1.3 2009/10/23 02:32:33 snj Exp $   */
 
 /*
  *
@@ -13,11 +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 Christian Limpach.
- * 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 IMPLIED WARRANTIES
diff -r 3c59a887ebbc -r 9bc3d169bf33 sys/arch/xen/include/xbdvar.h
--- a/sys/arch/xen/include/xbdvar.h     Fri Oct 23 00:39:29 2009 +0000
+++ b/sys/arch/xen/include/xbdvar.h     Fri Oct 23 02:32:33 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdvar.h,v 1.11 2008/04/16 18:41:48 cegger Exp $ */
+/* $NetBSD: xbdvar.h,v 1.12 2009/10/23 02:32:33 snj Exp $ */
 
 /*
  *
@@ -13,11 +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 Christian Limpach.
- * 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 IMPLIED WARRANTIES
diff -r 3c59a887ebbc -r 9bc3d169bf33 sys/arch/xen/include/xenfunc.h
--- a/sys/arch/xen/include/xenfunc.h    Fri Oct 23 00:39:29 2009 +0000
+++ b/sys/arch/xen/include/xenfunc.h    Fri Oct 23 02:32:33 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xenfunc.h,v 1.14 2008/01/11 20:00:42 bouyer Exp $      */
+/*     $NetBSD: xenfunc.h,v 1.15 2009/10/23 02:32:33 snj Exp $ */
 
 /*
  *
@@ -13,11 +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 Christian Limpach.
- * 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 IMPLIED WARRANTIES
diff -r 3c59a887ebbc -r 9bc3d169bf33 sys/arch/xen/include/xenpmap.h
--- a/sys/arch/xen/include/xenpmap.h    Fri Oct 23 00:39:29 2009 +0000
+++ b/sys/arch/xen/include/xenpmap.h    Fri Oct 23 02:32:33 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xenpmap.h,v 1.23 2009/07/29 12:02:06 cegger Exp $      */
+/*     $NetBSD: xenpmap.h,v 1.24 2009/10/23 02:32:33 snj Exp $ */
 
 /*
  *
@@ -13,11 +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 Christian Limpach.
- * 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 IMPLIED WARRANTIES
diff -r 3c59a887ebbc -r 9bc3d169bf33 sys/arch/xen/x86/hypervisor_machdep.c
--- a/sys/arch/xen/x86/hypervisor_machdep.c     Fri Oct 23 00:39:29 2009 +0000
+++ b/sys/arch/xen/x86/hypervisor_machdep.c     Fri Oct 23 02:32:33 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hypervisor_machdep.c,v 1.12 2009/07/29 12:02:08 cegger Exp $   */
+/*     $NetBSD: hypervisor_machdep.c,v 1.13 2009/10/23 02:32:34 snj Exp $      */
 
 /*
  *
@@ -13,11 +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 Christian Limpach.
- * 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 IMPLIED WARRANTIES
@@ -59,7 +54,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.12 2009/07/29 12:02:08 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor_machdep.c,v 1.13 2009/10/23 02:32:34 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 3c59a887ebbc -r 9bc3d169bf33 sys/arch/xen/x86/x86_xpmap.c
--- a/sys/arch/xen/x86/x86_xpmap.c      Fri Oct 23 00:39:29 2009 +0000
+++ b/sys/arch/xen/x86/x86_xpmap.c      Fri Oct 23 02:32:33 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_xpmap.c,v 1.16 2009/10/19 18:41:11 bouyer Exp $    */
+/*     $NetBSD: x86_xpmap.c,v 1.17 2009/10/23 02:32:34 snj Exp $       */
 
 /*
  * Copyright (c) 2006 Mathieu Ropert <mro%adviseo.fr@localhost>
@@ -54,11 +54,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 Christian Limpach.
- * 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 IMPLIED WARRANTIES
@@ -74,7 +69,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.16 2009/10/19 18:41:11 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.17 2009/10/23 02:32:34 snj Exp $");
 
 #include "opt_xen.h"
 #include "opt_ddb.h"
diff -r 3c59a887ebbc -r 9bc3d169bf33 sys/arch/xen/x86/xenfunc.c
--- a/sys/arch/xen/x86/xenfunc.c        Fri Oct 23 00:39:29 2009 +0000
+++ b/sys/arch/xen/x86/xenfunc.c        Fri Oct 23 02:32:33 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xenfunc.c,v 1.8 2009/07/29 12:02:08 cegger Exp $       */
+/*     $NetBSD: xenfunc.c,v 1.9 2009/10/23 02:32:34 snj Exp $  */
 
 /*
  *
@@ -13,11 +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 Christian Limpach.
- * 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 IMPLIED WARRANTIES
@@ -32,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.8 2009/07/29 12:02:08 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.9 2009/10/23 02:32:34 snj Exp $");
 
 #include <sys/param.h>
 
diff -r 3c59a887ebbc -r 9bc3d169bf33 sys/arch/xen/xen/clock.c
--- a/sys/arch/xen/xen/clock.c  Fri Oct 23 00:39:29 2009 +0000
+++ b/sys/arch/xen/xen/clock.c  Fri Oct 23 02:32:33 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.51 2009/07/29 12:02:09 cegger Exp $        */
+/*     $NetBSD: clock.c,v 1.52 2009/10/23 02:32:34 snj Exp $   */
 
 /*
  *
@@ -13,11 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the