From a476ba06d5016dd96ede66d0a2bb7c2a73d19810 Mon Sep 17 00:00:00 2001 From: imp Date: Wed, 4 Dec 2019 16:56:11 +0000 Subject: [PATCH] Regularize my copyright notice o Remove All Rights Reserved from my notices o imp@FreeBSD.org everywhere o regularize punctiation, eliminate date ranges o Make sure that it's clear that I don't claim All Rights reserved by listing All Rights Reserved on same line as other copyright holders (but not me). Other such holders are also listed last where it's clear. --- UPDATING | 2 +- lib/libc/stdlib/reallocf.c | 3 +-- lib/libc/sys/compat-ino64.h | 1 - lib/libc/sys/fstat.c | 1 - lib/libc/sys/fstatat.c | 1 - lib/libc/sys/fstatfs.c | 1 - lib/libc/sys/getdirentries.c | 1 - lib/libc/sys/getfsstat.c | 1 - lib/libc/sys/lstat.c | 3 +-- lib/libc/sys/stat.c | 3 +-- lib/libc/sys/statfs.c | 1 - libexec/rc/rc.d/devmatch | 2 +- libexec/talkd/extern.h | 2 +- sbin/devd/devd.8 | 3 +-- sbin/devd/devd.cc | 3 +-- sbin/devd/devd.conf.5 | 3 +-- sbin/devd/devd.h | 3 +-- sbin/devd/devd.hh | 3 +-- sbin/devd/parse.y | 3 +-- sbin/devd/token.l | 3 +-- share/man/man4/cardbus.4 | 3 +-- share/man/man4/devctl.4 | 3 +-- share/man/man4/exca.4 | 3 +-- share/man/man4/iic.4 | 5 ++--- share/man/man4/mmc.4 | 3 +-- share/man/man4/mmcsd.4 | 3 +-- share/man/man4/ow.4 | 3 +-- share/man/man4/ow_temp.4 | 3 +-- share/man/man4/owc.4 | 3 +-- share/man/man4/pccard.4 | 3 +-- share/man/man4/pccbb.4 | 3 +-- share/man/man4/pcib.4 | 3 +-- share/man/man4/pcic.4 | 3 +-- share/man/man4/ufm.4 | 3 +-- share/man/man5/os-release.5 | 3 ++- stand/common/paths.h | 3 +-- stand/common/zfs_cmd.c | 2 +- stand/liblua/float.h | 2 +- stand/liblua/locale.h | 2 +- stand/liblua/math.h | 2 +- stand/libsa/uuid_from_string.c | 3 +-- stand/libsa/uuid_to_string.c | 3 +-- sys/amd64/include/_bus.h | 3 +-- sys/arm/allwinner/a10_ahci.c | 5 ++--- sys/arm/conf/genboardid.awk | 2 +- sys/arm/include/_bus.h | 2 +- sys/arm/include/atags.h | 2 +- sys/arm/include/board.h | 2 +- sys/arm/xilinx/uart_dev_cdnc.c | 7 +++---- sys/arm64/include/_bus.h | 3 +-- sys/cam/mmc/mmc_da.c | 7 +++---- sys/dev/cardbus/cardbus.c | 3 +-- sys/dev/cardbus/cardbus_cis.c | 6 +++--- sys/dev/cardbus/cardbus_device.c | 3 +-- sys/dev/cardbus/cardbusvar.h | 5 ++--- sys/dev/exca/exca.c | 2 +- sys/dev/exca/excareg.h | 2 +- sys/dev/exca/excavar.h | 2 +- sys/dev/fdc/fdc_isa.c | 3 +-- sys/dev/fdc/fdc_pccard.c | 3 +-- sys/dev/fdc/fdcvar.h | 3 +-- sys/dev/flash/at45d.c | 9 ++++----- sys/dev/flash/mx25l.c | 2 +- sys/dev/flash/n25q.c | 3 +-- sys/dev/iicbus/icee.c | 2 +- sys/dev/mii/axphy.c | 3 +-- sys/dev/mmc/bridge.h | 2 +- sys/dev/mmc/mmc.c | 2 +- sys/dev/mmc/mmc_private.h | 2 +- sys/dev/mmc/mmc_subr.c | 2 +- sys/dev/mmc/mmc_subr.h | 2 +- sys/dev/mmc/mmcbr_if.m | 3 +-- sys/dev/mmc/mmcbrvar.h | 2 +- sys/dev/mmc/mmcbus_if.m | 3 +-- sys/dev/mmc/mmcreg.h | 2 +- sys/dev/mmc/mmcsd.c | 2 +- sys/dev/mmc/mmcvar.h | 2 +- sys/dev/ow/ow.c | 3 +-- sys/dev/ow/ow.h | 3 +-- sys/dev/ow/ow_temp.c | 3 +-- sys/dev/ow/owc_gpiobus.c | 3 +-- sys/dev/ow/owll.h | 3 +-- sys/dev/ow/owll_if.m | 3 +-- sys/dev/ow/own.h | 3 +-- sys/dev/ow/own_if.m | 3 +-- sys/dev/pccard/card_if.m | 3 +-- sys/dev/pccard/pccard_device.c | 3 +-- sys/dev/pccard/pccardvarp.h | 3 +-- sys/dev/pccard/power_if.m | 3 +-- sys/dev/pccbb/pccbb.c | 5 ++--- sys/dev/pccbb/pccbb_isa.c | 3 +-- sys/dev/pccbb/pccbb_pci.c | 5 ++--- sys/dev/pccbb/pccbbdevid.h | 2 +- sys/dev/pccbb/pccbbvar.h | 5 ++--- sys/dev/puc/puc_pci.c | 2 +- sys/dev/sdhci/sdhci_if.m | 3 +-- sys/dev/spibus/spi.h | 3 +-- sys/dev/spibus/spibus.c | 3 +-- sys/dev/spibus/spibus_if.m | 3 +-- sys/dev/spibus/spibusvar.h | 3 +-- sys/dev/uart/uart_bus_acpi.c | 2 +- sys/dev/uart/uart_bus_isa.c | 7 +++---- sys/dev/uart/uart_bus_pccard.c | 2 +- sys/dev/uart/uart_bus_pci.c | 5 ++--- sys/dev/uart/uart_bus_puc.c | 2 +- sys/dev/usb/controller/generic_ohci.c | 2 +- sys/dev/usb/misc/ufm.c | 3 +-- sys/dev/usb/serial/ufoma.c | 5 ++--- sys/dev/usb/serial/umodem.c | 3 +-- sys/dev/usb/ufm_ioctl.h | 3 +-- sys/dev/wi/if_wivar.h | 2 +- sys/i386/include/_bus.h | 3 +-- sys/mips/cavium/uart_cpu_octeonusart.c | 3 +-- sys/mips/include/_bus.h | 3 +-- sys/mips/include/elf.h | 2 +- sys/mips/mips/ptrace_machdep.c | 3 +-- sys/powerpc/include/_bus.h | 3 +-- sys/riscv/include/_bus.h | 3 +-- sys/sparc64/include/_bus.h | 3 +-- tools/tools/git/git-svn-rebase | 2 +- tools/tools/nanobsd/dhcpd/common | 2 +- tools/tools/nanobsd/dhcpd/os-base | 2 +- tools/tools/nanobsd/embedded/beaglebone.cfg | 2 +- tools/tools/nanobsd/embedded/common | 2 +- tools/tools/nanobsd/embedded/i386.cfg | 2 +- tools/tools/nanobsd/embedded/pandaboard.cfg | 2 +- tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg | 2 +- tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg | 2 +- tools/tools/nanobsd/embedded/qemu-amd64.cfg | 2 +- tools/tools/nanobsd/embedded/qemu-armv7.cfg | 2 +- tools/tools/nanobsd/embedded/qemu-i386.cfg | 2 +- tools/tools/nanobsd/embedded/qemu-mips.cfg | 2 +- tools/tools/nanobsd/embedded/qemu-mips64.cfg | 2 +- tools/tools/nanobsd/embedded/qemu-powerpc.cfg | 2 +- tools/tools/nanobsd/embedded/qemu-powerpc64.cfg | 2 +- tools/tools/nanobsd/embedded/qemu-sparc64.cfg | 2 +- tools/tools/nanobsd/embedded/rpi.cfg | 2 +- tools/tools/nanobsd/embedded/rpi2.cfg | 2 +- tools/tools/nanobsd/embedded/rpi3.cfg | 2 +- tools/tools/nanobsd/legacy.sh | 6 +++--- tools/tools/nanobsd/mtree-dedup.awk | 2 +- usr.sbin/dumpcis/dumpcis.8 | 1 - usr.sbin/dumpcis/main.c | 2 +- 143 files changed, 157 insertions(+), 241 deletions(-) diff --git a/UPDATING b/UPDATING index 649ea8f5203..8ae17727d28 100644 --- a/UPDATING +++ b/UPDATING @@ -2120,7 +2120,7 @@ to fetch an UPDATING file from an older FreeBSD release. Copyright information: -Copyright 1998-2009 M. Warner Losh. +Copyright 1998-2009 M. Warner Losh Redistribution, publication, translation and use, with or without modification, in full or in part, in any form or format of this diff --git a/lib/libc/stdlib/reallocf.c b/lib/libc/stdlib/reallocf.c index 470d55bd736..9cebfd0c951 100644 --- a/lib/libc/stdlib/reallocf.c +++ b/lib/libc/stdlib/reallocf.c @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 1998, M. Warner Losh - * All rights reserved. + * Copyright (c) 1998 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib/libc/sys/compat-ino64.h b/lib/libc/sys/compat-ino64.h index dde741e4f08..009efd63c59 100644 --- a/lib/libc/sys/compat-ino64.h +++ b/lib/libc/sys/compat-ino64.h @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 M. Warner Losh - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib/libc/sys/fstat.c b/lib/libc/sys/fstat.c index a57a8aad52a..d31b1f54bb1 100644 --- a/lib/libc/sys/fstat.c +++ b/lib/libc/sys/fstat.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 M. Warner Losh - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib/libc/sys/fstatat.c b/lib/libc/sys/fstatat.c index 5e6edccdb97..104f22ee16b 100644 --- a/lib/libc/sys/fstatat.c +++ b/lib/libc/sys/fstatat.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 M. Warner Losh - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib/libc/sys/fstatfs.c b/lib/libc/sys/fstatfs.c index 71ee12dc0bf..836127842c4 100644 --- a/lib/libc/sys/fstatfs.c +++ b/lib/libc/sys/fstatfs.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 M. Warner Losh - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib/libc/sys/getdirentries.c b/lib/libc/sys/getdirentries.c index 469e6d26d79..5a94c6096d5 100644 --- a/lib/libc/sys/getdirentries.c +++ b/lib/libc/sys/getdirentries.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 M. Warner Losh - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib/libc/sys/getfsstat.c b/lib/libc/sys/getfsstat.c index ca81f3e9fd5..edbfaa989b5 100644 --- a/lib/libc/sys/getfsstat.c +++ b/lib/libc/sys/getfsstat.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 M. Warner Losh - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib/libc/sys/lstat.c b/lib/libc/sys/lstat.c index d639a42d3dd..4b7e0b1bf2b 100644 --- a/lib/libc/sys/lstat.c +++ b/lib/libc/sys/lstat.c @@ -1,7 +1,6 @@ /*- + * Copyright (c) 2012 Gleb Kurtsou All rights reserved. * Copyright (c) 2017 M. Warner Losh - * Copyright (c) 2012 Gleb Kurtsou - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib/libc/sys/stat.c b/lib/libc/sys/stat.c index a7ed7baf5c2..f4f0289b2bd 100644 --- a/lib/libc/sys/stat.c +++ b/lib/libc/sys/stat.c @@ -1,7 +1,6 @@ /*- + * Copyright (c) 2012 Gleb Kurtsou All rights reserved. * Copyright (c) 2017 M. Warner Losh - * Copyright (c) 2012 Gleb Kurtsou - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib/libc/sys/statfs.c b/lib/libc/sys/statfs.c index 63774e999d9..f7d4d7752c4 100644 --- a/lib/libc/sys/statfs.c +++ b/lib/libc/sys/statfs.c @@ -1,6 +1,5 @@ /*- * Copyright (c) 2017 M. Warner Losh - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/libexec/rc/rc.d/devmatch b/libexec/rc/rc.d/devmatch index 234aaf6dae0..baad83a68fb 100755 --- a/libexec/rc/rc.d/devmatch +++ b/libexec/rc/rc.d/devmatch @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (c) 2018 M. Warner Losh +# Copyright (c) 2018 M. Warner Losh # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/libexec/talkd/extern.h b/libexec/talkd/extern.h index 3314ebbbbfd..f81efe72102 100644 --- a/libexec/talkd/extern.h +++ b/libexec/talkd/extern.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2002 M. Warner Losh. + * Copyright (c) 2002 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sbin/devd/devd.8 b/sbin/devd/devd.8 index 7faf188bd40..fa05db734b8 100644 --- a/sbin/devd/devd.8 +++ b/sbin/devd/devd.8 @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2002 M. Warner Losh. -.\" All rights reserved. +.\" Copyright (c) 2002 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index b2d08324511..afd57d452f0 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-FreeBSD * - * Copyright (c) 2002-2010 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2002-2010 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5 index ade9ede3527..ca1ee38e178 100644 --- a/sbin/devd/devd.conf.5 +++ b/sbin/devd/devd.conf.5 @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2002 M. Warner Losh -.\" All rights reserved. +.\" Copyright (c) 2002 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/sbin/devd/devd.h b/sbin/devd/devd.h index ca2903ce385..a291e814129 100644 --- a/sbin/devd/devd.h +++ b/sbin/devd/devd.h @@ -3,8 +3,7 @@ * * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2002 M. Warner Losh . - * All rights reserved. + * Copyright (c) 2002 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sbin/devd/devd.hh b/sbin/devd/devd.hh index d770da22226..62511d8ec3a 100644 --- a/sbin/devd/devd.hh +++ b/sbin/devd/devd.hh @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2002-2003 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2002-2003 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sbin/devd/parse.y b/sbin/devd/parse.y index ae5cbdfae82..9b8fd592045 100644 --- a/sbin/devd/parse.y +++ b/sbin/devd/parse.y @@ -4,8 +4,7 @@ * * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2002 M. Warner Losh . - * All rights reserved. + * Copyright (c) 2002 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sbin/devd/token.l b/sbin/devd/token.l index 7f11f8ef074..30e48e815fe 100644 --- a/sbin/devd/token.l +++ b/sbin/devd/token.l @@ -4,8 +4,7 @@ * * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2002 M. Warner Losh . - * All rights reserved. + * Copyright (c) 2002 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/share/man/man4/cardbus.4 b/share/man/man4/cardbus.4 index 1c3600a9168..ddd886dde9b 100644 --- a/share/man/man4/cardbus.4 +++ b/share/man/man4/cardbus.4 @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2002 M. Warner Losh -.\" All rights reserved. +.\" Copyright (c) 2002 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/share/man/man4/devctl.4 b/share/man/man4/devctl.4 index f71d029a32e..dc035f1246d 100644 --- a/share/man/man4/devctl.4 +++ b/share/man/man4/devctl.4 @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2002 M. Warner Losh -.\" All rights reserved. +.\" Copyright (c) 2002 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/share/man/man4/exca.4 b/share/man/man4/exca.4 index 90b13307fdd..d659593b577 100644 --- a/share/man/man4/exca.4 +++ b/share/man/man4/exca.4 @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2003 M. Warner Losh -.\" All rights reserved. +.\" Copyright (c) 2003 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/share/man/man4/iic.4 b/share/man/man4/iic.4 index a63a039702e..77a8177e5d1 100644 --- a/share/man/man4/iic.4 +++ b/share/man/man4/iic.4 @@ -1,6 +1,5 @@ -.\" Copyright (c) 2006, M. Warner Losh -.\" Copyright (c) 1998, Nicolas Souchu -.\" All rights reserved. +.\" Copyright (c) 1998, Nicolas Souchu All rights reserved. +.\" Copyright (c) 2006 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/share/man/man4/mmc.4 b/share/man/man4/mmc.4 index 184ac90cddf..49f333135ad 100644 --- a/share/man/man4/mmc.4 +++ b/share/man/man4/mmc.4 @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2007 M. Warner Losh -.\" All rights reserved. +.\" Copyright (c) 2007 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/share/man/man4/mmcsd.4 b/share/man/man4/mmcsd.4 index a0bcbcd9da2..e66867eb345 100644 --- a/share/man/man4/mmcsd.4 +++ b/share/man/man4/mmcsd.4 @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2007 M. Warner Losh -.\" All rights reserved. +.\" Copyright (c) 2007 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/share/man/man4/ow.4 b/share/man/man4/ow.4 index fde2ef5fad0..425b891a0c2 100644 --- a/share/man/man4/ow.4 +++ b/share/man/man4/ow.4 @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2015 M. Warner Losh -.\" All rights reserved. +.\" Copyright (c) 2015 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/share/man/man4/ow_temp.4 b/share/man/man4/ow_temp.4 index eaaf3c56c29..291bb0ce471 100644 --- a/share/man/man4/ow_temp.4 +++ b/share/man/man4/ow_temp.4 @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2015 M. Warner Losh -.\" All rights reserved. +.\" Copyright (c) 2015 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/share/man/man4/owc.4 b/share/man/man4/owc.4 index 06c4e909ac9..f1fbd4f3c8d 100644 --- a/share/man/man4/owc.4 +++ b/share/man/man4/owc.4 @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2015 M. Warner Losh -.\" All rights reserved. +.\" Copyright (c) 2015 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/share/man/man4/pccard.4 b/share/man/man4/pccard.4 index f955804978e..df37c4eae19 100644 --- a/share/man/man4/pccard.4 +++ b/share/man/man4/pccard.4 @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2002 M. Warner Losh -.\" All rights reserved. +.\" Copyright (c) 2002 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/share/man/man4/pccbb.4 b/share/man/man4/pccbb.4 index 6018bec7b64..0feabfb4137 100644 --- a/share/man/man4/pccbb.4 +++ b/share/man/man4/pccbb.4 @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2002-2003 M. Warner Losh -.\" All rights reserved. +.\" Copyright (c) 2002-2003 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/share/man/man4/pcib.4 b/share/man/man4/pcib.4 index e57b66c97ac..22efe2f3e1c 100644 --- a/share/man/man4/pcib.4 +++ b/share/man/man4/pcib.4 @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2008 M. Warner Losh -.\" All rights reserved. +.\" Copyright (c) 2008 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/share/man/man4/pcic.4 b/share/man/man4/pcic.4 index 589a2ed5c9a..045b543b418 100644 --- a/share/man/man4/pcic.4 +++ b/share/man/man4/pcic.4 @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2001, 2002 M. Warner Losh -.\" All rights reserved. +.\" Copyright (c) 2001-2002 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/share/man/man4/ufm.4 b/share/man/man4/ufm.4 index a06d45cfd35..9901fe7c6b2 100644 --- a/share/man/man4/ufm.4 +++ b/share/man/man4/ufm.4 @@ -1,5 +1,4 @@ -.\" Copyright (c) 2003 M. Warner Losh -.\" . All rights reserved. +.\" Copyright (c) 2003 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/share/man/man5/os-release.5 b/share/man/man5/os-release.5 index 0ad154859e3..ab56e477cf3 100644 --- a/share/man/man5/os-release.5 +++ b/share/man/man5/os-release.5 @@ -1,4 +1,5 @@ -.\" Copyright (c) 2019 M. Warner Losh. +.\" +.\" Copyright (c) 2019 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/stand/common/paths.h b/stand/common/paths.h index b3231377012..ed30abda490 100644 --- a/stand/common/paths.h +++ b/stand/common/paths.h @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2016 M. Warner Losh - * All rights reserved. + * Copyright (c) 2016 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/stand/common/zfs_cmd.c b/stand/common/zfs_cmd.c index cb98f725626..5f27f76b788 100644 --- a/stand/common/zfs_cmd.c +++ b/stand/common/zfs_cmd.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 M. Warner Losh + * Copyright (c) 2018 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/stand/liblua/float.h b/stand/liblua/float.h index c37bbaa29f0..fa958597bb5 100644 --- a/stand/liblua/float.h +++ b/stand/liblua/float.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 M. Warner Losh + * Copyright (c) 2018 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/stand/liblua/locale.h b/stand/liblua/locale.h index d0822025821..b6420935d83 100644 --- a/stand/liblua/locale.h +++ b/stand/liblua/locale.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 M. Warner Losh + * Copyright (c) 2018 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/stand/liblua/math.h b/stand/liblua/math.h index 8d95a6ebc56..c29466f1af4 100644 --- a/stand/liblua/math.h +++ b/stand/liblua/math.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 M. Warner Losh + * Copyright (c) 2018 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/stand/libsa/uuid_from_string.c b/stand/libsa/uuid_from_string.c index 7a59b4189ea..b28e204b273 100644 --- a/stand/libsa/uuid_from_string.c +++ b/stand/libsa/uuid_from_string.c @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2015 M. Warner Losh - * All rights reserved. + * Copyright (c) 2015 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/stand/libsa/uuid_to_string.c b/stand/libsa/uuid_to_string.c index d878af495ac..68d3d73515d 100644 --- a/stand/libsa/uuid_to_string.c +++ b/stand/libsa/uuid_to_string.c @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2015 M. Warner Losh - * All rights reserved. + * Copyright (c) 2015 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/amd64/include/_bus.h b/sys/amd64/include/_bus.h index 73482b452e6..a437489bf1d 100644 --- a/sys/amd64/include/_bus.h +++ b/sys/amd64/include/_bus.h @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/arm/allwinner/a10_ahci.c b/sys/arm/allwinner/a10_ahci.c index 7e149e2dd9e..73e722ea169 100644 --- a/sys/arm/allwinner/a10_ahci.c +++ b/sys/arm/allwinner/a10_ahci.c @@ -1,7 +1,6 @@ /*- - * Copyright (c) 2014-2015 M. Warner Losh - * Copyright (c) 2015 Luiz Otavio O Souza - * All rights reserved. + * Copyright (c) 2015 Luiz Otavio O Souza All rights reserved. + * Copyright (c) 2014-2015 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/arm/conf/genboardid.awk b/sys/arm/conf/genboardid.awk index 03338ad9e69..f07993b1ef8 100644 --- a/sys/arm/conf/genboardid.awk +++ b/sys/arm/conf/genboardid.awk @@ -4,7 +4,7 @@ #- # SPDX-License-Identifier: BSD-2-Clause-FreeBSD # -# Copyright (c) 2012 M. Warner Losh. +# Copyright (c) 2012 M. Warner Losh # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/sys/arm/include/_bus.h b/sys/arm/include/_bus.h index 9bb51e989ff..803dda2e276 100644 --- a/sys/arm/include/_bus.h +++ b/sys/arm/include/_bus.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005 M. Warner Losh. + * Copyright (c) 2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/arm/include/atags.h b/sys/arm/include/atags.h index 91d52ed28a5..baf39b5c0c6 100644 --- a/sys/arm/include/atags.h +++ b/sys/arm/include/atags.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2012 M. Warner Losh. + * Copyright (c) 2012 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/arm/include/board.h b/sys/arm/include/board.h index 82a06b3795c..62554a5d68e 100644 --- a/sys/arm/include/board.h +++ b/sys/arm/include/board.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2012 M. Warner Losh. + * Copyright (c) 2012 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/arm/xilinx/uart_dev_cdnc.c b/sys/arm/xilinx/uart_dev_cdnc.c index 05fde412f7c..1dc2b584e97 100644 --- a/sys/arm/xilinx/uart_dev_cdnc.c +++ b/sys/arm/xilinx/uart_dev_cdnc.c @@ -1,10 +1,9 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005 M. Warner Losh - * Copyright (c) 2005 Olivier Houchard - * Copyright (c) 2012 Thomas Skibo - * All rights reserved. + * Copyright (c) 2005 Olivier Houchard All rights reserved. + * Copyright (c) 2012 Thomas Skibo All rights reserved. + * Copyright (c) 2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/arm64/include/_bus.h b/sys/arm64/include/_bus.h index f11991f65ed..e2d3069323d 100644 --- a/sys/arm64/include/_bus.h +++ b/sys/arm64/include/_bus.h @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2005 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c index d0a3b35c0b4..b5f8a106c67 100644 --- a/sys/cam/mmc/mmc_da.c +++ b/sys/cam/mmc/mmc_da.c @@ -1,11 +1,10 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 Bernd Walter + * Copyright (c) 2006 Bernd Walter All rights reserved. + * Copyright (c) 2009 Alexander Motin All rights reserved. + * Copyright (c) 2015-2017 Ilya Bakulin All rights reserved. * Copyright (c) 2006 M. Warner Losh - * Copyright (c) 2009 Alexander Motin - * Copyright (c) 2015-2017 Ilya Bakulin - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 938e9b13459..8f20a6c81fe 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -2,8 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2000,2001 Jonathan Chen. All rights reserved. - * - * Copyright (c) 2003-2008 M. Warner Losh. + * Copyright (c) 2003-2008 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c index 83442c2d0d4..17161e22248 100644 --- a/sys/dev/cardbus/cardbus_cis.c +++ b/sys/dev/cardbus/cardbus_cis.c @@ -1,9 +1,9 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005-2008, M. Warner Losh - * Copyright (c) 2000,2001 Jonathan Chen. - * All rights reserved. + * Copyright (c) 2000,2001 Jonathan Chen All rights reserved. + * Copyright (c) 2005-2008 M. Warner Losh + * * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/cardbus/cardbus_device.c b/sys/dev/cardbus/cardbus_device.c index de0a53a93f2..0de25572fa9 100644 --- a/sys/dev/cardbus/cardbus_device.c +++ b/sys/dev/cardbus/cardbus_device.c @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005-2008, M. Warner Losh - * All rights reserved. + * Copyright (c) 2005-2008 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h index 310923655a1..a8aa8f0aa57 100644 --- a/sys/dev/cardbus/cardbusvar.h +++ b/sys/dev/cardbus/cardbusvar.h @@ -1,9 +1,8 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2008, M. Warner Losh - * Copyright (c) 2000,2001 Jonathan Chen. - * All rights reserved. + * Copyright (c) 2000,2001 Jonathan Chen. All rights reserved. + * Copyright (c) 2008 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/exca/exca.c b/sys/dev/exca/exca.c index 060e0a548c9..f73da8345d1 100644 --- a/sys/dev/exca/exca.c +++ b/sys/dev/exca/exca.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD * - * Copyright (c) 2002-2005 M. Warner Losh. + * Copyright (c) 2002-2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/exca/excareg.h b/sys/dev/exca/excareg.h index 547d53122f8..ac7a064b368 100644 --- a/sys/dev/exca/excareg.h +++ b/sys/dev/exca/excareg.h @@ -4,7 +4,7 @@ /*- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD * - * Copyright (c) 2002 M. Warner Losh. + * Copyright (c) 2002 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/exca/excavar.h b/sys/dev/exca/excavar.h index 4e0fa61e727..2b52e1ac16e 100644 --- a/sys/dev/exca/excavar.h +++ b/sys/dev/exca/excavar.h @@ -3,7 +3,7 @@ /*- * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD * - * Copyright (c) 2002 M. Warner Losh. + * Copyright (c) 2002 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/fdc/fdc_isa.c b/sys/dev/fdc/fdc_isa.c index ab03c78a691..6b22c05fb85 100644 --- a/sys/dev/fdc/fdc_isa.c +++ b/sys/dev/fdc/fdc_isa.c @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2004-2005 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2004-2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/fdc/fdc_pccard.c b/sys/dev/fdc/fdc_pccard.c index 2b7a3196f2a..364e2104b64 100644 --- a/sys/dev/fdc/fdc_pccard.c +++ b/sys/dev/fdc/fdc_pccard.c @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2004-2005 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2004-2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/fdc/fdcvar.h b/sys/dev/fdc/fdcvar.h index f492d094987..3a2159db134 100644 --- a/sys/dev/fdc/fdcvar.h +++ b/sys/dev/fdc/fdcvar.h @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2004-2005 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2004-2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/flash/at45d.c b/sys/dev/flash/at45d.c index 4704dc500f4..c5339576c3d 100644 --- a/sys/dev/flash/at45d.c +++ b/sys/dev/flash/at45d.c @@ -1,11 +1,10 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh - * Copyright (c) 2011-2012 Ian Lepore - * Copyright (c) 2012 Marius Strobl - * All rights reserved. - * + * Copyright (c) 2011-2012 Ian Lepore All rights reserved. + * Copyright (c) 2012 Marius Strobl All rights reserved. + * Copyright (c) 2006 M. Warner Losh + * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: diff --git a/sys/dev/flash/mx25l.c b/sys/dev/flash/mx25l.c index 373b09a31b8..3d146882eea 100644 --- a/sys/dev/flash/mx25l.c +++ b/sys/dev/flash/mx25l.c @@ -1,9 +1,9 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. * Copyright (c) 2009 Oleksandr Tymoshenko. All rights reserved. * Copyright (c) 2018 Ian Lepore. All rights reserved. + * Copyright (c) 2006 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/flash/n25q.c b/sys/dev/flash/n25q.c index 428e998f41a..b885da983fc 100644 --- a/sys/dev/flash/n25q.c +++ b/sys/dev/flash/n25q.c @@ -1,9 +1,8 @@ /*- - * Copyright (c) 2006 M. Warner Losh. * Copyright (c) 2009 Oleksandr Tymoshenko. All rights reserved. * Copyright (c) 2017 Ruslan Bukin * Copyright (c) 2018 Ian Lepore. All rights reserved. - * All rights reserved. + * Copyright (c) 2006 M. Warner Losh * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237 diff --git a/sys/dev/iicbus/icee.c b/sys/dev/iicbus/icee.c index 0f6ab4d0700..18cf8e9bd52 100644 --- a/sys/dev/iicbus/icee.c +++ b/sys/dev/iicbus/icee.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. + * Copyright (c) 2006 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/mii/axphy.c b/sys/dev/mii/axphy.c index 34192f11f84..2e32486f1ee 100644 --- a/sys/dev/mii/axphy.c +++ b/sys/dev/mii/axphy.c @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2009, M. Warner Losh - * All rights reserved. + * Copyright (c) 2009 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/mmc/bridge.h b/sys/dev/mmc/bridge.h index d32abbacedb..5fbe1166370 100644 --- a/sys/dev/mmc/bridge.h +++ b/sys/dev/mmc/bridge.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. + * Copyright (c) 2006 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/mmc/mmc.c b/sys/dev/mmc/mmc.c index 4b77fc48c48..5a318ffe8c6 100644 --- a/sys/dev/mmc/mmc.c +++ b/sys/dev/mmc/mmc.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2006 Bernd Walter. All rights reserved. - * Copyright (c) 2006 M. Warner Losh. + * Copyright (c) 2006 M. Warner Losh * Copyright (c) 2017 Marius Strobl * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/mmc/mmc_private.h b/sys/dev/mmc/mmc_private.h index a633d235550..4e969402aa7 100644 --- a/sys/dev/mmc/mmc_private.h +++ b/sys/dev/mmc/mmc_private.h @@ -1,6 +1,6 @@ /*- * Copyright (c) 2006 Bernd Walter. All rights reserved. - * Copyright (c) 2006 M. Warner Losh. + * Copyright (c) 2006 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/mmc/mmc_subr.c b/sys/dev/mmc/mmc_subr.c index 6469e76c661..53c9009c6e6 100644 --- a/sys/dev/mmc/mmc_subr.c +++ b/sys/dev/mmc/mmc_subr.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 2006 Bernd Walter. All rights reserved. - * Copyright (c) 2006 M. Warner Losh. + * Copyright (c) 2006 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/mmc/mmc_subr.h b/sys/dev/mmc/mmc_subr.h index 80c1ce2fad2..14c3c5b94ee 100644 --- a/sys/dev/mmc/mmc_subr.h +++ b/sys/dev/mmc/mmc_subr.h @@ -1,6 +1,6 @@ /*- * Copyright (c) 2006 Bernd Walter. All rights reserved. - * Copyright (c) 2006 M. Warner Losh. + * Copyright (c) 2006 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/mmc/mmcbr_if.m b/sys/dev/mmc/mmcbr_if.m index 497ff3acca2..72f712d7594 100644 --- a/sys/dev/mmc/mmcbr_if.m +++ b/sys/dev/mmc/mmcbr_if.m @@ -1,6 +1,5 @@ #- -# Copyright (c) 2006 M. Warner Losh -# All rights reserved. +# Copyright (c) 2006 M. Warner Losh # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/sys/dev/mmc/mmcbrvar.h b/sys/dev/mmc/mmcbrvar.h index b05c029dff9..90095710dbb 100644 --- a/sys/dev/mmc/mmcbrvar.h +++ b/sys/dev/mmc/mmcbrvar.h @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2006 Bernd Walter. All rights reserved. - * Copyright (c) 2006 M. Warner Losh. + * Copyright (c) 2006 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/mmc/mmcbus_if.m b/sys/dev/mmc/mmcbus_if.m index b55f26486e5..d3e6d7276ea 100644 --- a/sys/dev/mmc/mmcbus_if.m +++ b/sys/dev/mmc/mmcbus_if.m @@ -1,6 +1,5 @@ #- -# Copyright (c) 2006 M. Warner Losh -# All rights reserved. +# Copyright (c) 2006 M. Warner Losh # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/sys/dev/mmc/mmcreg.h b/sys/dev/mmc/mmcreg.h index b78b2078c6f..8fc6ba06ff8 100644 --- a/sys/dev/mmc/mmcreg.h +++ b/sys/dev/mmc/mmcreg.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. + * Copyright (c) 2006 M. Warner Losh * Copyright (c) 2017 Marius Strobl * Copyright (c) 2015-2016 Ilya Bakulin * diff --git a/sys/dev/mmc/mmcsd.c b/sys/dev/mmc/mmcsd.c index 4743ffd6b49..dcb8290b821 100644 --- a/sys/dev/mmc/mmcsd.c +++ b/sys/dev/mmc/mmcsd.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2006 Bernd Walter. All rights reserved. - * Copyright (c) 2006 M. Warner Losh. + * Copyright (c) 2006 M. Warner Losh * Copyright (c) 2017 Marius Strobl * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/mmc/mmcvar.h b/sys/dev/mmc/mmcvar.h index 8d8c5547f3c..1714f73e3dd 100644 --- a/sys/dev/mmc/mmcvar.h +++ b/sys/dev/mmc/mmcvar.h @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2006 Bernd Walter. All rights reserved. - * Copyright (c) 2006 M. Warner Losh. + * Copyright (c) 2006 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/ow/ow.c b/sys/dev/ow/ow.c index 4f3e570088c..c598be3a4a6 100644 --- a/sys/dev/ow/ow.c +++ b/sys/dev/ow/ow.c @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2015 M. Warner Losh - * All rights reserved. + * Copyright (c) 2015 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/ow/ow.h b/sys/dev/ow/ow.h index 359f86fe75d..18621e74153 100644 --- a/sys/dev/ow/ow.h +++ b/sys/dev/ow/ow.h @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2015 M. Warner Losh - * All rights reserved. + * Copyright (c) 2015 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/ow/ow_temp.c b/sys/dev/ow/ow_temp.c index 58783949961..cd0a6183806 100644 --- a/sys/dev/ow/ow_temp.c +++ b/sys/dev/ow/ow_temp.c @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2015 M. Warner Losh - * All rights reserved. + * Copyright (c) 2015 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/ow/owc_gpiobus.c b/sys/dev/ow/owc_gpiobus.c index eff2243f91e..0ed6ca10514 100644 --- a/sys/dev/ow/owc_gpiobus.c +++ b/sys/dev/ow/owc_gpiobus.c @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2015 M. Warner Losh - * All rights reserved. + * Copyright (c) 2015 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/ow/owll.h b/sys/dev/ow/owll.h index ba2572a0b66..a601e8ed826 100644 --- a/sys/dev/ow/owll.h +++ b/sys/dev/ow/owll.h @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2015 M. Warner Losh - * All rights reserved. + * Copyright (c) 2015 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/ow/owll_if.m b/sys/dev/ow/owll_if.m index 4dd0793562e..22e237cea12 100644 --- a/sys/dev/ow/owll_if.m +++ b/sys/dev/ow/owll_if.m @@ -1,6 +1,5 @@ #- -# Copyright (c) 2015 M. Warner Losh -# All rights reserved. +# Copyright (c) 2015 M. Warner Losh # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/sys/dev/ow/own.h b/sys/dev/ow/own.h index 769730f4037..c7cc441168d 100644 --- a/sys/dev/ow/own.h +++ b/sys/dev/ow/own.h @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2015 M. Warner Losh - * All rights reserved. + * Copyright (c) 2015 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/ow/own_if.m b/sys/dev/ow/own_if.m index 583bace4c27..e4b4bb8d7c7 100644 --- a/sys/dev/ow/own_if.m +++ b/sys/dev/ow/own_if.m @@ -1,6 +1,5 @@ #- -# Copyright (c) 2015 M. Warner Losh -# All rights reserved. +# Copyright (c) 2015 M. Warner Losh # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/sys/dev/pccard/card_if.m b/sys/dev/pccard/card_if.m index 606af16b3e5..e1b816807a4 100644 --- a/sys/dev/pccard/card_if.m +++ b/sys/dev/pccard/card_if.m @@ -1,6 +1,5 @@ #- -# Copyright (c) 1999 M. Warner Losh. -# All rights reserved. +# Copyright (c) 1999 M. Warner Losh # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/sys/dev/pccard/pccard_device.c b/sys/dev/pccard/pccard_device.c index 844422b54d5..8b476a4074f 100644 --- a/sys/dev/pccard/pccard_device.c +++ b/sys/dev/pccard/pccard_device.c @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005, M. Warner Losh - * All rights reserved. + * Copyright (c) 2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/pccard/pccardvarp.h b/sys/dev/pccard/pccardvarp.h index 89890c00bed..16d7c07ac4b 100644 --- a/sys/dev/pccard/pccardvarp.h +++ b/sys/dev/pccard/pccardvarp.h @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005, M. Warner Losh - * All rights reserved. + * Copyright (c) 2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/pccard/power_if.m b/sys/dev/pccard/power_if.m index a85fd01e50e..b1067bda2b9 100644 --- a/sys/dev/pccard/power_if.m +++ b/sys/dev/pccard/power_if.m @@ -1,6 +1,5 @@ #- -# Copyright (c) 1999 M. Warner Losh. -# All rights reserved. +# Copyright (c) 1999 M. Warner Losh # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c index c4fcd2af06e..1b7c2f1ea9f 100644 --- a/sys/dev/pccbb/pccbb.c +++ b/sys/dev/pccbb/pccbb.c @@ -1,9 +1,8 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2002-2004 M. Warner Losh. - * Copyright (c) 2000-2001 Jonathan Chen. - * All rights reserved. + * Copyright (c) 2000-2001 Jonathan Chen All rights reserved. + * Copyright (c) 2002-2004 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/pccbb/pccbb_isa.c b/sys/dev/pccbb/pccbb_isa.c index cb50adf9a23..ecc8e709981 100644 --- a/sys/dev/pccbb/pccbb_isa.c +++ b/sys/dev/pccbb/pccbb_isa.c @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2002-2004 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2002-2004 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c index f2f6387c8aa..8288469bd1f 100644 --- a/sys/dev/pccbb/pccbb_pci.c +++ b/sys/dev/pccbb/pccbb_pci.c @@ -1,9 +1,8 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2002-2004 M. Warner Losh. - * Copyright (c) 2000-2001 Jonathan Chen. - * All rights reserved. + * Copyright (c) 2000-2001 Jonathan Chen All rights reserved. + * Copyright (c) 2002-2004 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/pccbb/pccbbdevid.h b/sys/dev/pccbb/pccbbdevid.h index 77b9d363dc4..be159c495ca 100644 --- a/sys/dev/pccbb/pccbbdevid.h +++ b/sys/dev/pccbb/pccbbdevid.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2001-2004 M. Warner Losh. + * Copyright (c) 2001-2004 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/pccbb/pccbbvar.h b/sys/dev/pccbb/pccbbvar.h index 400e466b077..451b2c54fca 100644 --- a/sys/dev/pccbb/pccbbvar.h +++ b/sys/dev/pccbb/pccbbvar.h @@ -1,9 +1,8 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2003-2004 M. Warner Losh. - * Copyright (c) 2000,2001 Jonathan Chen. - * All rights reserved. + * Copyright (c) 2000,2001 Jonathan Chen All rights reserved. + * Copyright (c) 2003-2004 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c index 0fbd5d7214d..1c5e7f83116 100644 --- a/sys/dev/puc/puc_pci.c +++ b/sys/dev/puc/puc_pci.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause * * Copyright (c) 2002 JF Hay. All rights reserved. - * Copyright (c) 2000 M. Warner Losh. + * Copyright (c) 2000 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/sdhci/sdhci_if.m b/sys/dev/sdhci/sdhci_if.m index b70f04c8d37..93c97a155fb 100644 --- a/sys/dev/sdhci/sdhci_if.m +++ b/sys/dev/sdhci/sdhci_if.m @@ -1,6 +1,5 @@ #- -# Copyright (c) 2006 M. Warner Losh -# All rights reserved. +# Copyright (c) 2006 M. Warner Losh # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/sys/dev/spibus/spi.h b/sys/dev/spibus/spi.h index fa911b6fd36..f09b1501317 100644 --- a/sys/dev/spibus/spi.h +++ b/sys/dev/spibus/spi.h @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2006 M. Warner Losh - * All rights reserved. + * Copyright (c) 2006 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c index c8c23bf6b28..44ca6957860 100644 --- a/sys/dev/spibus/spibus.c +++ b/sys/dev/spibus/spibus.c @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2006 M. Warner Losh - * All rights reserved. + * Copyright (c) 2006 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/spibus/spibus_if.m b/sys/dev/spibus/spibus_if.m index 4e8fa11f280..8e95c358fa8 100644 --- a/sys/dev/spibus/spibus_if.m +++ b/sys/dev/spibus/spibus_if.m @@ -1,6 +1,5 @@ #- -# Copyright (c) 2006 M. Warner Losh -# All rights reserved. +# Copyright (c) 2006 M. Warner Losh # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/sys/dev/spibus/spibusvar.h b/sys/dev/spibus/spibusvar.h index ffa016a15d6..582700f01a4 100644 --- a/sys/dev/spibus/spibusvar.h +++ b/sys/dev/spibus/spibusvar.h @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2006 M. Warner Losh - * All rights reserved. + * Copyright (c) 2006 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/uart/uart_bus_acpi.c b/sys/dev/uart/uart_bus_acpi.c index 32eb3accd92..14e598f5a31 100644 --- a/sys/dev/uart/uart_bus_acpi.c +++ b/sys/dev/uart/uart_bus_acpi.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2001 M. Warner Losh. + * Copyright (c) 2001 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/uart/uart_bus_isa.c b/sys/dev/uart/uart_bus_isa.c index 5085ff66fe1..cebf90adf13 100644 --- a/sys/dev/uart/uart_bus_isa.c +++ b/sys/dev/uart/uart_bus_isa.c @@ -1,10 +1,9 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2008 TAKAHASHI Yoshihiro - * Copyright (c) 2008 Marcel Moolenaar - * Copyright (c) 2001 M. Warner Losh - * All rights reserved. + * Copyright (c) 2008 TAKAHASHI Yoshihiro All rights reserved. + * Copyright (c) 2008 Marcel Moolenaar All rights reserved. + * Copyright (c) 2001 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/uart/uart_bus_pccard.c b/sys/dev/uart/uart_bus_pccard.c index 240cab86918..58571b13d66 100644 --- a/sys/dev/uart/uart_bus_pccard.c +++ b/sys/dev/uart/uart_bus_pccard.c @@ -1,8 +1,8 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2001 M. Warner Losh. * Copyright (c) 2003 Norikatsu Shigemura, Takenori Watanabe All rights reserved. + * Copyright (c) 2001 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c index 7bf308bc4d1..03005fe6ea5 100644 --- a/sys/dev/uart/uart_bus_pci.c +++ b/sys/dev/uart/uart_bus_pci.c @@ -1,9 +1,8 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 Marcel Moolenaar - * Copyright (c) 2001 M. Warner Losh - * All rights reserved. + * Copyright (c) 2006 Marcel Moolenaar All rights reserved. + * Copyright (c) 2001 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/uart/uart_bus_puc.c b/sys/dev/uart/uart_bus_puc.c index c6c7a705774..a1dcdea11dd 100644 --- a/sys/dev/uart/uart_bus_puc.c +++ b/sys/dev/uart/uart_bus_puc.c @@ -3,7 +3,7 @@ * * Copyright (c) 2006 Marcel Moolenaar. All rights reserved. * Copyright (c) 2002 JF Hay. All rights reserved. - * Copyright (c) 2001 M. Warner Losh. + * Copyright (c) 2001 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/usb/controller/generic_ohci.c b/sys/dev/usb/controller/generic_ohci.c index c3a97616226..4b6c4dd4fcf 100644 --- a/sys/dev/usb/controller/generic_ohci.c +++ b/sys/dev/usb/controller/generic_ohci.c @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2006 M. Warner Losh. * Copyright (c) 2016 Emmanuel Vadot All rights reserved. + * Copyright (c) 2006 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/usb/misc/ufm.c b/sys/dev/usb/misc/ufm.c index aecff8ed8bd..494158ad046 100644 --- a/sys/dev/usb/misc/ufm.c +++ b/sys/dev/usb/misc/ufm.c @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2001 M. Warner Losh - * All rights reserved. + * Copyright (c) 2001 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/usb/serial/ufoma.c b/sys/dev/usb/serial/ufoma.c index c27232eca21..eb58abc02af 100644 --- a/sys/dev/usb/serial/ufoma.c +++ b/sys/dev/usb/serial/ufoma.c @@ -6,9 +6,8 @@ __FBSDID("$FreeBSD$"); /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD * - * Copyright (c) 2005, Takanori Watanabe - * Copyright (c) 2003, M. Warner Losh . - * All rights reserved. + * Copyright (c) 2005, Takanori Watanabe All rights reserved. + * Copyright (c) 2003 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c index 567fbe3fd41..48ce73ff5d1 100644 --- a/sys/dev/usb/serial/umodem.c +++ b/sys/dev/usb/serial/umodem.c @@ -6,8 +6,7 @@ __FBSDID("$FreeBSD$"); /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD * - * Copyright (c) 2003, M. Warner Losh . - * All rights reserved. + * Copyright (c) 2003 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/usb/ufm_ioctl.h b/sys/dev/usb/ufm_ioctl.h index 599d36d4c62..dbd0862440a 100644 --- a/sys/dev/usb/ufm_ioctl.h +++ b/sys/dev/usb/ufm_ioctl.h @@ -2,8 +2,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2001 M. Warner Losh - * All rights reserved. + * Copyright (c) 2001 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/wi/if_wivar.h b/sys/dev/wi/if_wivar.h index a97b0abe066..eef1297fc87 100644 --- a/sys/dev/wi/if_wivar.h +++ b/sys/dev/wi/if_wivar.h @@ -1,9 +1,9 @@ /*- * SPDX-License-Identifier: BSD-4-Clause * - * Copyright (c) 2002 M Warner Losh . * Copyright (c) 1997, 1998, 1999 * Bill Paul . All rights reserved. + * Copyright (c) 2002 M Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/i386/include/_bus.h b/sys/i386/include/_bus.h index 2f0b84220b5..bd716938af6 100644 --- a/sys/i386/include/_bus.h +++ b/sys/i386/include/_bus.h @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/mips/cavium/uart_cpu_octeonusart.c b/sys/mips/cavium/uart_cpu_octeonusart.c index c81c2741a72..5aca02becee 100644 --- a/sys/mips/cavium/uart_cpu_octeonusart.c +++ b/sys/mips/cavium/uart_cpu_octeonusart.c @@ -1,9 +1,8 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * + * Copyright (c) 2006 Wojciech A. Koszek All rights reserved. * Copyright (c) 2009 M. Warner Losh - * Copyright (c) 2006 Wojciech A. Koszek - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/mips/include/_bus.h b/sys/mips/include/_bus.h index 866c19f4566..9edb1f183ef 100644 --- a/sys/mips/include/_bus.h +++ b/sys/mips/include/_bus.h @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/mips/include/elf.h b/sys/mips/include/elf.h index b019df7061e..d62b237fdac 100644 --- a/sys/mips/include/elf.h +++ b/sys/mips/include/elf.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD * - * Copyright (c) 2013 M. Warner Losh. + * Copyright (c) 2013 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/mips/mips/ptrace_machdep.c b/sys/mips/mips/ptrace_machdep.c index 372995c2369..8de58d6cc23 100644 --- a/sys/mips/mips/ptrace_machdep.c +++ b/sys/mips/mips/ptrace_machdep.c @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2009 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2009 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/powerpc/include/_bus.h b/sys/powerpc/include/_bus.h index d39fb003f27..5a36ee68da6 100644 --- a/sys/powerpc/include/_bus.h +++ b/sys/powerpc/include/_bus.h @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/riscv/include/_bus.h b/sys/riscv/include/_bus.h index f11991f65ed..e2d3069323d 100644 --- a/sys/riscv/include/_bus.h +++ b/sys/riscv/include/_bus.h @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2005 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/sparc64/include/_bus.h b/sys/sparc64/include/_bus.h index 554964612b2..e6b6101b9c5 100644 --- a/sys/sparc64/include/_bus.h +++ b/sys/sparc64/include/_bus.h @@ -1,8 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005 M. Warner Losh. - * All rights reserved. + * Copyright (c) 2005 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/tools/tools/git/git-svn-rebase b/tools/tools/git/git-svn-rebase index 4c2faf0cc12..7b31e327a4e 100755 --- a/tools/tools/git/git-svn-rebase +++ b/tools/tools/git/git-svn-rebase @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause-FreeBSD # -# Copyright (c) 2018 M. Warner Losh +# Copyright (c) 2018 M. Warner Losh # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/tools/tools/nanobsd/dhcpd/common b/tools/tools/nanobsd/dhcpd/common index dc595aa2811..6ea48b59376 100644 --- a/tools/tools/nanobsd/dhcpd/common +++ b/tools/tools/nanobsd/dhcpd/common @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2014 M. Warner Losh. +# Copyright (c) 2014 M. Warner Losh # Copyright (c) 2010 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/dhcpd/os-base b/tools/tools/nanobsd/dhcpd/os-base index 87615e7a637..4a4d0c4b855 100644 --- a/tools/tools/nanobsd/dhcpd/os-base +++ b/tools/tools/nanobsd/dhcpd/os-base @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2014 M. Warner Losh. +# Copyright (c) 2014 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/beaglebone.cfg b/tools/tools/nanobsd/embedded/beaglebone.cfg index 72c36bfd89a..03f5f8ac290 100644 --- a/tools/tools/nanobsd/embedded/beaglebone.cfg +++ b/tools/tools/nanobsd/embedded/beaglebone.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index 6c4c7adbe16..9233baa0383 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/i386.cfg b/tools/tools/nanobsd/embedded/i386.cfg index e897ece9c96..876cb105b11 100644 --- a/tools/tools/nanobsd/embedded/i386.cfg +++ b/tools/tools/nanobsd/embedded/i386.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/pandaboard.cfg b/tools/tools/nanobsd/embedded/pandaboard.cfg index 357a7ab7132..887df4f5b75 100644 --- a/tools/tools/nanobsd/embedded/pandaboard.cfg +++ b/tools/tools/nanobsd/embedded/pandaboard.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2016 M. Warner Losh. +# Copyright (c) 2016 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg b/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg index 7ac31de7242..98d8a49f097 100644 --- a/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg +++ b/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg b/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg index 083b0e6b064..d46b3fef0bd 100644 --- a/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg +++ b/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/qemu-amd64.cfg b/tools/tools/nanobsd/embedded/qemu-amd64.cfg index d1ad0a33c56..98b9ef47cad 100644 --- a/tools/tools/nanobsd/embedded/qemu-amd64.cfg +++ b/tools/tools/nanobsd/embedded/qemu-amd64.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/qemu-armv7.cfg b/tools/tools/nanobsd/embedded/qemu-armv7.cfg index c14c1681b9d..2bf3f48114d 100644 --- a/tools/tools/nanobsd/embedded/qemu-armv7.cfg +++ b/tools/tools/nanobsd/embedded/qemu-armv7.cfg @@ -2,7 +2,7 @@ #- # Copyright (c) 2016 Andrew Turner. All Rights Reserved. -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/qemu-i386.cfg b/tools/tools/nanobsd/embedded/qemu-i386.cfg index 660edea21cc..63310a073dc 100644 --- a/tools/tools/nanobsd/embedded/qemu-i386.cfg +++ b/tools/tools/nanobsd/embedded/qemu-i386.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/qemu-mips.cfg b/tools/tools/nanobsd/embedded/qemu-mips.cfg index c295ffcaa26..341f7f9c143 100644 --- a/tools/tools/nanobsd/embedded/qemu-mips.cfg +++ b/tools/tools/nanobsd/embedded/qemu-mips.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/qemu-mips64.cfg b/tools/tools/nanobsd/embedded/qemu-mips64.cfg index f4f50c4e470..6e936b15675 100644 --- a/tools/tools/nanobsd/embedded/qemu-mips64.cfg +++ b/tools/tools/nanobsd/embedded/qemu-mips64.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/qemu-powerpc.cfg b/tools/tools/nanobsd/embedded/qemu-powerpc.cfg index fc0a5174a55..2bde6e6dcec 100644 --- a/tools/tools/nanobsd/embedded/qemu-powerpc.cfg +++ b/tools/tools/nanobsd/embedded/qemu-powerpc.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg b/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg index b272f652552..e16cefdb743 100644 --- a/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg +++ b/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/qemu-sparc64.cfg b/tools/tools/nanobsd/embedded/qemu-sparc64.cfg index 3103094d18e..9a63c9b42d5 100644 --- a/tools/tools/nanobsd/embedded/qemu-sparc64.cfg +++ b/tools/tools/nanobsd/embedded/qemu-sparc64.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/rpi.cfg b/tools/tools/nanobsd/embedded/rpi.cfg index 4f241bd370c..bf367ed2620 100644 --- a/tools/tools/nanobsd/embedded/rpi.cfg +++ b/tools/tools/nanobsd/embedded/rpi.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/rpi2.cfg b/tools/tools/nanobsd/embedded/rpi2.cfg index 46c292bc71e..2776aec1877 100644 --- a/tools/tools/nanobsd/embedded/rpi2.cfg +++ b/tools/tools/nanobsd/embedded/rpi2.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/embedded/rpi3.cfg b/tools/tools/nanobsd/embedded/rpi3.cfg index ae008b4eb02..f3804c739b1 100644 --- a/tools/tools/nanobsd/embedded/rpi3.cfg +++ b/tools/tools/nanobsd/embedded/rpi3.cfg @@ -1,7 +1,7 @@ # $FreeBSD$ #- -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # Copyright (c) 2010-2011 iXsystems, Inc. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh index 0832179ba22..b59a9e795b6 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -1,8 +1,8 @@ #!/bin/sh # -# Copyright (c) 2005 Poul-Henning Kamp. -# Copyright (c) 2016 M. Warner Losh. -# All rights reserved. +# Copyright (c) 2005 Poul-Henning Kamp All rights reserved. +# Copyright (c) 2016 M. Warner Losh +# # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/tools/tools/nanobsd/mtree-dedup.awk b/tools/tools/nanobsd/mtree-dedup.awk index 5390540ff82..002a51f3fab 100755 --- a/tools/tools/nanobsd/mtree-dedup.awk +++ b/tools/tools/nanobsd/mtree-dedup.awk @@ -1,7 +1,7 @@ #!/usr/bin/awk -f # -# Copyright (c) 2015 M. Warner Losh. +# Copyright (c) 2015 M. Warner Losh # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/usr.sbin/dumpcis/dumpcis.8 b/usr.sbin/dumpcis/dumpcis.8 index 86949df6f28..3f49807f205 100644 --- a/usr.sbin/dumpcis/dumpcis.8 +++ b/usr.sbin/dumpcis/dumpcis.8 @@ -1,6 +1,5 @@ .\" .\" Copyright (c) 2006 M. Warner Losh -.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/usr.sbin/dumpcis/main.c b/usr.sbin/dumpcis/main.c index c130e80e811..28ae2dae49c 100644 --- a/usr.sbin/dumpcis/main.c +++ b/usr.sbin/dumpcis/main.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. + * Copyright (c) 2006 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions -- 2.45.0