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.
2019-12-04 16:56:11 +00:00 · 2019-12-04 16:56:11 +00:00 · a476ba06d5
commit a476ba06d5
parent 4e1cad8a93
143 changed files with 157 additions and 241 deletions
--- a/2
+++ b/2
@ -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 <imp@FreeBSD.org>

 Redistribution, publication, translation and use, with or without
 modification, in full or in part, in any form or format of this
--- 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 <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 1998 M. Warner Losh <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libc/sys/compat-ino64.h
+++ b/lib/libc/sys/compat-ino64.h
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libc/sys/fstat.c
+++ b/lib/libc/sys/fstat.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libc/sys/fstatat.c
+++ b/lib/libc/sys/fstatat.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libc/sys/fstatfs.c
+++ b/lib/libc/sys/fstatfs.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libc/sys/getdirentries.c
+++ b/lib/libc/sys/getdirentries.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libc/sys/getfsstat.c
+++ b/lib/libc/sys/getfsstat.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libc/sys/lstat.c
+++ b/lib/libc/sys/lstat.c
@ -1,7 +1,6 @@
 /*-
+ * Copyright (c) 2012 Gleb Kurtsou <gleb@FreeBSD.org> All rights reserved.
 * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * Copyright (c) 2012 Gleb Kurtsou <gleb@FreeBSD.org>
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libc/sys/stat.c
+++ b/lib/libc/sys/stat.c
@ -1,7 +1,6 @@
 /*-
+ * Copyright (c) 2012 Gleb Kurtsou <gleb@FreeBSD.org> All rights reserved.
 * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * Copyright (c) 2012 Gleb Kurtsou <gleb@FreeBSD.org>
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libc/sys/statfs.c
+++ b/lib/libc/sys/statfs.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@freebsd.org>.
- * All rights reserved.
+ * Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@freebsd.org>.
- * All rights reserved.
+ * Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@freebsd.org>.
- * All rights reserved.
+ * Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- a/share/man/man4/ufm.4
+++ b/share/man/man4/ufm.4
@ -1,5 +1,4 @@
-.\" Copyright (c) 2003 M. Warner Losh
-.\" 	<imp@FreeBSD.org>. All rights reserved.
+.\" Copyright (c) 2003 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- a/stand/common/paths.h
+++ b/stand/common/paths.h
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2016 M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2016 M. Warner Losh <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/stand/common/zfs_cmd.c
+++ b/stand/common/zfs_cmd.c
@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2018 M. Warner Losh <imp@freebd.org>
+ * Copyright (c) 2018 M. Warner Losh <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@freebsd.org>
- * Copyright (c) 2015 Luiz Otavio O Souza <loos@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 Luiz Otavio O Souza <loos@freebsd.org> All rights reserved.
+ * Copyright (c) 2014-2015 M. Warner Losh <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <tisco@FreeBSD.org>
+ * Copyright (c) 2006 Bernd Walter <tisco@FreeBSD.org> All rights reserved.
+ * Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org> All rights reserved.
+ * Copyright (c) 2015-2017 Ilya Bakulin <kibab@FreeBSD.org> All rights reserved.
 * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
- * Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
- * Copyright (c) 2015-2017 Ilya Bakulin <kibab@FreeBSD.org>
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
+ * 
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <marius@FreeBSD.org>
- * All rights reserved.
- *
+ * Copyright (c) 2011-2012 Ian Lepore All rights reserved.
+ * Copyright (c) 2012 Marius Strobl <marius@FreeBSD.org> All rights reserved.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
+
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <br@bsdpad.com>
 * Copyright (c) 2018 Ian Lepore.  All rights reserved.
- * All rights reserved.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
 *
 * This software was developed by SRI International and the University of
 * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 * Copyright (c) 2017 Marius Strobl <marius@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 * Copyright (c) 2017 Marius Strobl <marius@FreeBSD.org>
 * Copyright (c) 2015-2016 Ilya Bakulin <kibab@FreeBSD.org>
 *
--- 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 <imp@FreeBSD.org>
 * Copyright (c) 2017 Marius Strobl <marius@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/dev/ow/ow.c
+++ b/sys/dev/ow/ow.c
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/dev/ow/ow.h
+++ b/sys/dev/ow/ow.h
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/dev/ow/ow_temp.c
+++ b/sys/dev/ow/ow_temp.c
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/dev/ow/owc_gpiobus.c
+++ b/sys/dev/ow/owc_gpiobus.c
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/dev/ow/owll.h
+++ b/sys/dev/ow/owll.h
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/dev/ow/owll_if.m
+++ b/sys/dev/ow/owll_if.m
@ -1,6 +1,5 @@
 #-
-# Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
-# All rights reserved.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
--- a/sys/dev/ow/own.h
+++ b/sys/dev/ow/own.h
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/dev/ow/own_if.m
+++ b/sys/dev/ow/own_if.m
@ -1,6 +1,5 @@
 #-
-# Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
-# All rights reserved.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
--- 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 <imp@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/Show More
+++ b/Show More