Module Name: src
Committed By: ragge
Date: Mon May 22 17:22:29 UTC 2017
Modified Files:
src/sys/dev/qbus: dz_uba.c if_de.c if_qe.c rl.c rlreg.h rlvar.h tsreg.h
uba.c ubareg.h uda.c
Log Message:
Update copyright notice for Ludd (remove clause 3 & 4).
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/qbus/dz_uba.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/qbus/if_de.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/qbus/if_qe.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/qbus/rl.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/qbus/rlreg.h src/sys/dev/qbus/tsreg.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/qbus/rlvar.h
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/qbus/uba.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/qbus/ubareg.h
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/qbus/uda.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/qbus/dz_uba.c
diff -u src/sys/dev/qbus/dz_uba.c:1.28 src/sys/dev/qbus/dz_uba.c:1.29
--- src/sys/dev/qbus/dz_uba.c:1.28 Sat Mar 15 00:57:15 2008
+++ src/sys/dev/qbus/dz_uba.c Mon May 22 17:22:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_uba.c,v 1.28 2008/03/15 00:57:15 matt Exp $ */
+/* $NetBSD: dz_uba.c,v 1.29 2017/05/22 17:22:29 ragge Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden. All rights reserved.
* Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
@@ -11,11 +11,7 @@
* 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 at Ludd, University of
- * Lule}, Sweden and its contributors.
- * 4. The name of the author may not be used to endorse or promote products
+ * 3. 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
@@ -31,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.28 2008/03/15 00:57:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.29 2017/05/22 17:22:29 ragge Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/qbus/if_de.c
diff -u src/sys/dev/qbus/if_de.c:1.31 src/sys/dev/qbus/if_de.c:1.32
--- src/sys/dev/qbus/if_de.c:1.31 Thu Dec 15 09:28:06 2016
+++ src/sys/dev/qbus/if_de.c Mon May 22 17:22:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.31 2016/12/15 09:28:06 ozaki-r Exp $ */
+/* $NetBSD: if_de.c,v 1.32 2017/05/22 17:22:29 ragge Exp $ */
/*
* Copyright (c) 1982, 1986, 1989 Regents of the University of California.
@@ -45,13 +45,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 University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -64,8 +57,6 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * @(#)if_de.c 7.12 (Berkeley) 12/16/90
*/
/*
@@ -81,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.31 2016/12/15 09:28:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.32 2017/05/22 17:22:29 ragge Exp $");
#include "opt_inet.h"
Index: src/sys/dev/qbus/if_qe.c
diff -u src/sys/dev/qbus/if_qe.c:1.76 src/sys/dev/qbus/if_qe.c:1.77
--- src/sys/dev/qbus/if_qe.c:1.76 Thu Dec 15 09:28:06 2016
+++ src/sys/dev/qbus/if_qe.c Mon May 22 17:22:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qe.c,v 1.76 2016/12/15 09:28:06 ozaki-r Exp $ */
+/* $NetBSD: if_qe.c,v 1.77 2017/05/22 17:22:29 ragge Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -10,12 +10,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 at Ludd, University of
- * Lule}, Sweden 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 IMPLIED WARRANTIES
@@ -38,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.76 2016/12/15 09:28:06 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.77 2017/05/22 17:22:29 ragge Exp $");
#include "opt_inet.h"
Index: src/sys/dev/qbus/rl.c
diff -u src/sys/dev/qbus/rl.c:1.50 src/sys/dev/qbus/rl.c:1.51
--- src/sys/dev/qbus/rl.c:1.50 Sun Apr 26 15:15:20 2015
+++ src/sys/dev/qbus/rl.c Mon May 22 17:22:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rl.c,v 1.50 2015/04/26 15:15:20 mlelstv Exp $ */
+/* $NetBSD: rl.c,v 1.51 2017/05/22 17:22:29 ragge Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -11,12 +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 at Ludd, University of
- * Lule}, Sweden 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 IMPLIED WARRANTIES
@@ -43,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.50 2015/04/26 15:15:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.51 2017/05/22 17:22:29 ragge Exp $");
#include <sys/param.h>
#include <sys/device.h>
Index: src/sys/dev/qbus/rlreg.h
diff -u src/sys/dev/qbus/rlreg.h:1.4 src/sys/dev/qbus/rlreg.h:1.5
--- src/sys/dev/qbus/rlreg.h:1.4 Sun Dec 11 12:23:29 2005
+++ src/sys/dev/qbus/rlreg.h Mon May 22 17:22:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rlreg.h,v 1.4 2005/12/11 12:23:29 christos Exp $ */
+/* $NetBSD: rlreg.h,v 1.5 2017/05/22 17:22:29 ragge Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -11,12 +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 at Ludd, University of
- * Lule}, Sweden 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 IMPLIED WARRANTIES
Index: src/sys/dev/qbus/tsreg.h
diff -u src/sys/dev/qbus/tsreg.h:1.4 src/sys/dev/qbus/tsreg.h:1.5
--- src/sys/dev/qbus/tsreg.h:1.4 Sun Dec 11 12:23:29 2005
+++ src/sys/dev/qbus/tsreg.h Mon May 22 17:22:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tsreg.h,v 1.4 2005/12/11 12:23:29 christos Exp $ */
+/* $NetBSD: tsreg.h,v 1.5 2017/05/22 17:22:29 ragge Exp $ */
/*
* Copyright (c) 1995 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -14,12 +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 at Ludd, University of
- * Lule}, Sweden 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 IMPLIED WARRANTIES
Index: src/sys/dev/qbus/rlvar.h
diff -u src/sys/dev/qbus/rlvar.h:1.8 src/sys/dev/qbus/rlvar.h:1.9
--- src/sys/dev/qbus/rlvar.h:1.8 Tue Mar 11 05:34:02 2008
+++ src/sys/dev/qbus/rlvar.h Mon May 22 17:22:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rlvar.h,v 1.8 2008/03/11 05:34:02 matt Exp $ */
+/* $NetBSD: rlvar.h,v 1.9 2017/05/22 17:22:29 ragge Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -11,12 +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 at Ludd, University of
- * Lule}, Sweden 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 IMPLIED WARRANTIES
@@ -36,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rlvar.h,v 1.8 2008/03/11 05:34:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rlvar.h,v 1.9 2017/05/22 17:22:29 ragge Exp $");
struct rlc_softc {
device_t sc_dev;
Index: src/sys/dev/qbus/uba.c
diff -u src/sys/dev/qbus/uba.c:1.79 src/sys/dev/qbus/uba.c:1.80
--- src/sys/dev/qbus/uba.c:1.79 Sat Nov 13 13:52:10 2010
+++ src/sys/dev/qbus/uba.c Mon May 22 17:22:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uba.c,v 1.79 2010/11/13 13:52:10 uebayasi Exp $ */
+/* $NetBSD: uba.c,v 1.80 2017/05/22 17:22:29 ragge Exp $ */
/*
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -44,13 +44,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 University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -69,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.79 2010/11/13 13:52:10 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.80 2017/05/22 17:22:29 ragge Exp $");
#include <sys/param.h>
#include <sys/time.h>
Index: src/sys/dev/qbus/ubareg.h
diff -u src/sys/dev/qbus/ubareg.h:1.16 src/sys/dev/qbus/ubareg.h:1.17
--- src/sys/dev/qbus/ubareg.h:1.16 Sun Apr 30 11:46:03 2000
+++ src/sys/dev/qbus/ubareg.h Mon May 22 17:22:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ubareg.h,v 1.16 2000/04/30 11:46:03 ragge Exp $ */
+/* $NetBSD: ubareg.h,v 1.17 2017/05/22 17:22:29 ragge Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -11,12 +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 at Ludd, University of
- * Lule}, Sweden 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 IMPLIED WARRANTIES
Index: src/sys/dev/qbus/uda.c
diff -u src/sys/dev/qbus/uda.c:1.60 src/sys/dev/qbus/uda.c:1.61
--- src/sys/dev/qbus/uda.c:1.60 Tue May 12 14:08:35 2009
+++ src/sys/dev/qbus/uda.c Mon May 22 17:22:29 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uda.c,v 1.60 2009/05/12 14:08:35 cegger Exp $ */
+/* $NetBSD: uda.c,v 1.61 2017/05/22 17:22:29 ragge Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -37,9 +37,6 @@
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
*
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -48,13 +45,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 University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -76,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.60 2009/05/12 14:08:35 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.61 2017/05/22 17:22:29 ragge Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
