Module Name: src Committed By: maya Date: Wed Oct 16 21:52:22 UTC 2019
Modified Files: src/sbin/mount_nilfs: mount_nilfs.8 mount_nilfs.c src/sbin/mount_udf: mount_udf.8 mount_udf.c src/sys/arch/arm/iomd: qms.c src/sys/dev/pci: auixp.c auixpreg.h auixpvar.h src/sys/fs/nilfs: nilfs_mount.h src/sys/fs/udf: udf_mount.h Log Message: Switch files copyright Reinoud Zandijk from BSD 4 clause to BSD 2 clause. OK'd by reinoud in email (from 4 Feb 2019). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sbin/mount_nilfs/mount_nilfs.8 cvs rdiff -u -r1.3 -r1.4 src/sbin/mount_nilfs/mount_nilfs.c cvs rdiff -u -r1.13 -r1.14 src/sbin/mount_udf/mount_udf.8 cvs rdiff -u -r1.14 -r1.15 src/sbin/mount_udf/mount_udf.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/iomd/qms.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/pci/auixp.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/auixpreg.h cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/auixpvar.h cvs rdiff -u -r1.1 -r1.2 src/sys/fs/nilfs/nilfs_mount.h cvs rdiff -u -r1.3 -r1.4 src/sys/fs/udf/udf_mount.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sbin/mount_nilfs/mount_nilfs.8 diff -u src/sbin/mount_nilfs/mount_nilfs.8:1.4 src/sbin/mount_nilfs/mount_nilfs.8:1.5 --- src/sbin/mount_nilfs/mount_nilfs.8:1.4 Wed Jun 1 12:01:21 2016 +++ src/sbin/mount_nilfs/mount_nilfs.8 Wed Oct 16 21:52:22 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount_nilfs.8,v 1.4 2016/06/01 12:01:21 wiz Exp $ +.\" $NetBSD: mount_nilfs.8,v 1.5 2019/10/16 21:52:22 maya Exp $ .\" .\" Copyright (c) 2008, 2009 Reinoud Zandijk .\" All rights reserved. @@ -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 for the -.\" NetBSD Project. See http://www.NetBSD.org/ for -.\" information about NetBSD. -.\" 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/sbin/mount_nilfs/mount_nilfs.c diff -u src/sbin/mount_nilfs/mount_nilfs.c:1.3 src/sbin/mount_nilfs/mount_nilfs.c:1.4 --- src/sbin/mount_nilfs/mount_nilfs.c:1.3 Sun Feb 21 22:51:29 2016 +++ src/sbin/mount_nilfs/mount_nilfs.c Wed Oct 16 21:52:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mount_nilfs.c,v 1.3 2016/02/21 22:51:29 christos Exp $ */ +/* $NetBSD: mount_nilfs.c,v 1.4 2019/10/16 21:52:22 maya Exp $ */ /* * Copyright (c) 2008, 2009 Reinoud Zandijk @@ -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 for the - * NetBSD Project. See http://www.NetBSD.org/ for - * information about NetBSD. - * 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 +29,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: mount_nilfs.c,v 1.3 2016/02/21 22:51:29 christos Exp $"); +__RCSID("$NetBSD: mount_nilfs.c,v 1.4 2019/10/16 21:52:22 maya Exp $"); #endif /* not lint */ Index: src/sbin/mount_udf/mount_udf.8 diff -u src/sbin/mount_udf/mount_udf.8:1.13 src/sbin/mount_udf/mount_udf.8:1.14 --- src/sbin/mount_udf/mount_udf.8:1.13 Mon Sep 12 02:45:07 2016 +++ src/sbin/mount_udf/mount_udf.8 Wed Oct 16 21:52:22 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount_udf.8,v 1.13 2016/09/12 02:45:07 sevan Exp $ +.\" $NetBSD: mount_udf.8,v 1.14 2019/10/16 21:52:22 maya Exp $ .\" .\" Copyright (c) 2006, 2008 Reinoud Zandijk .\" All rights reserved. @@ -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 for the -.\" NetBSD Project. See http://www.NetBSD.org/ for -.\" information about NetBSD. -.\" 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/sbin/mount_udf/mount_udf.c diff -u src/sbin/mount_udf/mount_udf.c:1.14 src/sbin/mount_udf/mount_udf.c:1.15 --- src/sbin/mount_udf/mount_udf.c:1.14 Sun Feb 21 22:51:30 2016 +++ src/sbin/mount_udf/mount_udf.c Wed Oct 16 21:52:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mount_udf.c,v 1.14 2016/02/21 22:51:30 christos Exp $ */ +/* $NetBSD: mount_udf.c,v 1.15 2019/10/16 21:52:22 maya Exp $ */ /* * Copyright (c) 2006 Reinoud Zandijk @@ -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 for the - * NetBSD Project. See http://www.NetBSD.org/ for - * information about NetBSD. - * 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 +29,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: mount_udf.c,v 1.14 2016/02/21 22:51:30 christos Exp $"); +__RCSID("$NetBSD: mount_udf.c,v 1.15 2019/10/16 21:52:22 maya Exp $"); #endif /* not lint */ Index: src/sys/arch/arm/iomd/qms.c diff -u src/sys/arch/arm/iomd/qms.c:1.18 src/sys/arch/arm/iomd/qms.c:1.19 --- src/sys/arch/arm/iomd/qms.c:1.18 Mon May 14 10:38:08 2012 +++ src/sys/arch/arm/iomd/qms.c Wed Oct 16 21:52:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: qms.c,v 1.18 2012/05/14 10:38:08 skrll Exp $ */ +/* $NetBSD: qms.c,v 1.19 2019/10/16 21:52:22 maya Exp $ */ /*- * Copyright (c) 2001 Reinoud Zandijk @@ -15,13 +15,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -41,7 +34,7 @@ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: qms.c,v 1.18 2012/05/14 10:38:08 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: qms.c,v 1.19 2019/10/16 21:52:22 maya Exp $"); #include <sys/callout.h> #include <sys/device.h> Index: src/sys/dev/pci/auixp.c diff -u src/sys/dev/pci/auixp.c:1.47 src/sys/dev/pci/auixp.c:1.48 --- src/sys/dev/pci/auixp.c:1.47 Sat Jun 8 08:02:38 2019 +++ src/sys/dev/pci/auixp.c Wed Oct 16 21:52:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: auixp.c,v 1.47 2019/06/08 08:02:38 isaki Exp $ */ +/* $NetBSD: auixp.c,v 1.48 2019/10/16 21:52:22 maya Exp $ */ /* * Copyright (c) 2004, 2005 Reinoud Zandijk <rein...@netbsd.org> @@ -11,13 +11,6 @@ * notice, this list of conditions and the following disclaimer. * 2. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. - * 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 AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -50,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.47 2019/06/08 08:02:38 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.48 2019/10/16 21:52:22 maya Exp $"); #include <sys/types.h> #include <sys/errno.h> Index: src/sys/dev/pci/auixpreg.h diff -u src/sys/dev/pci/auixpreg.h:1.3 src/sys/dev/pci/auixpreg.h:1.4 --- src/sys/dev/pci/auixpreg.h:1.3 Sun Dec 11 12:22:48 2005 +++ src/sys/dev/pci/auixpreg.h Wed Oct 16 21:52:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: auixpreg.h,v 1.3 2005/12/11 12:22:48 christos Exp $ */ +/* $NetBSD: auixpreg.h,v 1.4 2019/10/16 21:52:22 maya Exp $ */ /* * Copyright (c) 2004, 2005 Reinoud Zandijk <rein...@netbsd.org> @@ -11,13 +11,6 @@ * notice, this list of conditions and the following disclaimer. * 2. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. - * 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 AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/dev/pci/auixpvar.h diff -u src/sys/dev/pci/auixpvar.h:1.9 src/sys/dev/pci/auixpvar.h:1.10 --- src/sys/dev/pci/auixpvar.h:1.9 Wed May 8 13:40:18 2019 +++ src/sys/dev/pci/auixpvar.h Wed Oct 16 21:52:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: auixpvar.h,v 1.9 2019/05/08 13:40:18 isaki Exp $*/ +/* $NetBSD: auixpvar.h,v 1.10 2019/10/16 21:52:22 maya Exp $*/ /* * Copyright (c) 2004, 2005 Reinoud Zandijk <rein...@netbsd.org> @@ -11,13 +11,6 @@ * notice, this list of conditions and the following disclaimer. * 2. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. - * 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 AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES Index: src/sys/fs/nilfs/nilfs_mount.h diff -u src/sys/fs/nilfs/nilfs_mount.h:1.1 src/sys/fs/nilfs/nilfs_mount.h:1.2 --- src/sys/fs/nilfs/nilfs_mount.h:1.1 Sat Jul 18 16:31:42 2009 +++ src/sys/fs/nilfs/nilfs_mount.h Wed Oct 16 21:52:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: nilfs_mount.h,v 1.1 2009/07/18 16:31:42 reinoud Exp $ */ +/* $NetBSD: nilfs_mount.h,v 1.2 2019/10/16 21:52:22 maya Exp $ */ /* * Copyright (c) 2008, 2009 Reinoud Zandijk @@ -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 for the - * NetBSD Project. See http://www.NetBSD.org/ for - * information about NetBSD. - * 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/fs/udf/udf_mount.h diff -u src/sys/fs/udf/udf_mount.h:1.3 src/sys/fs/udf/udf_mount.h:1.4 --- src/sys/fs/udf/udf_mount.h:1.3 Thu Feb 2 15:52:23 2006 +++ src/sys/fs/udf/udf_mount.h Wed Oct 16 21:52:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: udf_mount.h,v 1.3 2006/02/02 15:52:23 reinoud Exp $ */ +/* $NetBSD: udf_mount.h,v 1.4 2019/10/16 21:52:22 maya Exp $ */ /* * Copyright (c) 2006 Reinoud Zandijk @@ -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 for the - * NetBSD Project. See http://www.NetBSD.org/ for - * information about NetBSD. - * 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