Regularize the Netflix copyright

Use recent best practices for Copyright form at the top of the license: 1. Remove all the All Rights Reserved clauses on our stuff. Where we piggybacked others, use a separate line to make things clear. 2. Use "Netflix, Inc." everywhere. 3. Use a single line for the copyright for grep friendliness. 4. Use date ranges in all places for our stuff. Approved by: Netflix Legal (who gave me the form), adrian@ (pmc files)
2019-02-04 21:28:25 +00:00 · 2019-02-04 21:28:25 +00:00 · 82650adfef
commit 82650adfef
parent 73bcd05fc5
70 changed files with 63 additions and 100 deletions
--- a/lib/libefivar/efi-osdep.h
+++ b/lib/libefivar/efi-osdep.h
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libefivar/efivar-dp-format.c
+++ b/lib/libefivar/efivar-dp-format.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libefivar/efivar-dp-parse.c
+++ b/lib/libefivar/efivar-dp-parse.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libefivar/efivar-dp-xlate.c
+++ b/lib/libefivar/efivar-dp-xlate.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libefivar/efivar-dp.h
+++ b/lib/libefivar/efivar-dp.h
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libefivar/efivar.3
+++ b/lib/libefivar/efivar.3
@ -1,3 +1,4 @@
+.\"
 .\" Copyright 2016 Netflix, Inc.
 .\" All rights reserved.
 .\"
--- a/lib/libefivar/efivar.c
+++ b/lib/libefivar/efivar.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2016 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libefivar/efivar.h
+++ b/lib/libefivar/efivar.h
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2016 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libefivar/uefi-dplib.h
+++ b/lib/libefivar/uefi-dplib.h
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/lib/libefivar/uefi-dputil.c
+++ b/lib/libefivar/uefi-dputil.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sbin/devmatch/devmatch.8
+++ b/sbin/devmatch/devmatch.8
@ -1,7 +1,5 @@
 .\"
-.\" Copyright (c) 2017 Netflix, Inc
-.\"
-.\" All rights reserved.
+.\" Copyright (c) 2017 Netflix, Inc.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- a/sbin/devmatch/devmatch.c
+++ b/sbin/devmatch/devmatch.c
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2017 Netflix, Inc
- * All rights reserved.
+ * Copyright (c) 2017 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sbin/nvmecontrol/modules/wdc/wdc.c
+++ b/sbin/nvmecontrol/modules/wdc/wdc.c
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2017 Netflix, Inc
- * All rights reserved.
+ * Copyright (c) 2017 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sbin/nvmecontrol/nc_util.c
+++ b/sbin/nvmecontrol/nc_util.c
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2017 Netflix, Inc
- * All rights reserved.
+ * Copyright (c) 2017 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sbin/nvmecontrol/ns.c
+++ b/sbin/nvmecontrol/ns.c
@ -1,7 +1,7 @@
 /*-
 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 *
- * Copyright (c) 2017 Netflix, Inc
+ * Copyright (c) 2017 Netflix, Inc.
 * Copyright (C) 2018 Alexander Motin <mav@FreeBSD.org>
 *
 * Redistribution and use in source and binary forms, with or without
--- a/sbin/nvmecontrol/nvmecontrol_ext.h
+++ b/sbin/nvmecontrol/nvmecontrol_ext.h
@ -1,7 +1,7 @@
 /*-
 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 *
- * Copyright (C) 2018 Netflix
+ * Copyright (C) 2018 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sbin/nvmecontrol/power.c
+++ b/sbin/nvmecontrol/power.c
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2016 Netflix, Inc
- * All rights reserved.
+ * Copyright (c) 2016 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/share/man/man4/nda.4
+++ b/share/man/man4/nda.4
@ -1,5 +1,5 @@
-.\" Copyright (c) 2017 Netflix, Inc
-.\" All rights reserved.
+.\"
+.\" Copyright (c) 2017 Netflix, Inc.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- a/share/man/man9/kern_testfrwk.9
+++ b/share/man/man9/kern_testfrwk.9
@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2015 Netflix Inc.
-.\" All rights reserved.
+.\" Copyright (c) 2015 Netflix, Inc.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- a/stand/efi/libefi/efienv.c
+++ b/stand/efi/libefi/efienv.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2018 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/stand/efi/libefi/env.c
+++ b/stand/efi/libefi/env.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Netflix, Inc. All Rights Reserved.
+ * Copyright (c) 2015 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/stand/efi/libefi/wchar.c
+++ b/stand/efi/libefi/wchar.c
@ -1,5 +1,5 @@
 /*-
- * Copyright 2016 Netflix, Inc. All Rights Reserved.
+ * Copyright 2016 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/stand/efi/loader/main.c
+++ b/stand/efi/loader/main.c
@ -1,9 +1,10 @@
 /*-
 * Copyright (c) 2008-2010 Rui Paulo
 * Copyright (c) 2006 Marcel Moolenaar
- * Copyright (c) 2018 Netflix, Inc
 * All rights reserved.
 *
+ * Copyright (c) 2018 Netflix, Inc.
+ * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
--- a/stand/forth/efi.4th
+++ b/stand/forth/efi.4th
@ -1,5 +1,5 @@
-\ Copyright (c) 2016 Netflix, Inc
-\ All rights reserved.
+\
+\ Copyright (c) 2016 Netflix, Inc.
 \
 \ Redistribution and use in source and binary forms, with or without
 \ modification, are permitted provided that the following conditions
--- a/stand/i386/libi386/biospci.c
+++ b/stand/i386/libi386/biospci.c
@ -1,8 +1,9 @@
 /*-
 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
- * Copyright (c) 2016 Netflix, Inc
 * All rights reserved.
 *
+ * Copyright (c) 2016 Netflix, Inc.
+ *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
--- a/stand/libsa/abort.c
+++ b/stand/libsa/abort.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Netflix. All Rights Reserved.
+ * Copyright (c) 2018 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/stand/libsa/xlocale_private.h
+++ b/stand/libsa/xlocale_private.h
@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2018 Netflix
+ * Copyright (c) 2018 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/cam/nvme/nvme_all.c
+++ b/sys/cam/nvme/nvme_all.c
@ -1,7 +1,7 @@
 /*-
 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 *
- * Copyright (c) 2015 Netflix, Inc
+ * Copyright (c) 2015 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/cam/nvme/nvme_all.h
+++ b/sys/cam/nvme/nvme_all.h
@ -1,7 +1,7 @@
 /*-
 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 *
- * Copyright (c) 2015 Netflix, Inc
+ * Copyright (c) 2015 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/cam/nvme/nvme_da.c
+++ b/sys/cam/nvme/nvme_da.c
@ -1,7 +1,7 @@
 /*-
 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 *
- * Copyright (c) 2015 Netflix, Inc
+ * Copyright (c) 2015 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/crypto/aesni/aesencdec.h
+++ b/sys/crypto/aesni/aesencdec.h
@ -1,8 +1,9 @@
 /*-
 * Copyright 2013 John-Mark Gurney <jmg@FreeBSD.org>
- * Copyright 2015 Netflix, Inc.
 * All rights reserved.
 *
+ * Copyright 2015 Netflix, Inc.
+ *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
--- a/sys/dev/efidev/efidev.c
+++ b/sys/dev/efidev/efidev.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2016 Netflix, Inc.
- * 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/nvme/nvme_sim.c
+++ b/sys/dev/nvme/nvme_sim.c
@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2016 Netflix, Inc
+ * Copyright (c) 2016 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/dev/tcp_log/tcp_log_dev.c
+++ b/sys/dev/tcp_log/tcp_log_dev.c
@ -1,8 +1,7 @@
 /*-
 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 *
- * Copyright (c) 2016-2017
- *	Netflix Inc.  All rights reserved.
+ * Copyright (c) 2016-2017 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/dev/tcp_log/tcp_log_dev.h
+++ b/sys/dev/tcp_log/tcp_log_dev.h
@ -1,8 +1,7 @@
 /*-
 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 *
- * Copyright (c) 2016
- *	Netflix Inc.  All rights reserved.
+ * Copyright (c) 2016 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/kern/subr_boot.c
+++ b/sys/kern/subr_boot.c
@ -10,7 +10,7 @@
 * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
 * All Rights Reserved.
 * Copyright (c) 2018 Kyle Evans <kevans@FreeBSD.org>
- * Copyright (c) 2018 Netflix
+ * Copyright (c) 2018 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/netinet/tcp_hpts.c
+++ b/sys/netinet/tcp_hpts.c
@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2016-2018 Netflix Inc.
+ * Copyright (c) 2016-2018 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/netinet/tcp_hpts.h
+++ b/sys/netinet/tcp_hpts.h
@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2016-2018 Netflix Inc.
+ * Copyright (c) 2016-2018 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/netinet/tcp_log_buf.c
+++ b/sys/netinet/tcp_log_buf.c
@ -1,8 +1,7 @@
 /*-
 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 *
- * Copyright (c) 2016-2018
- *	Netflix Inc.  All rights reserved.
+ * Copyright (c) 2016-2018 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/netinet/tcp_log_buf.h
+++ b/sys/netinet/tcp_log_buf.h
@ -1,8 +1,7 @@
 /*-
 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 *
- * Copyright (c) 2016-2018
- *	Netflix Inc.  All rights reserved.
+ * Copyright (c) 2016-2018 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2016-2018
- *	Netflix Inc.  All rights reserved.
+ * Copyright (c) 2016-2018 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/netinet/tcp_stacks/rack_bbr_common.h
+++ b/sys/netinet/tcp_stacks/rack_bbr_common.h
@ -1,9 +1,7 @@
 #ifndef __pacer_timer_h__
 #define __pacer_timer_h__
 /*-
- * Copyright (c) 2017
- *	Netflix Inc.
- *      All rights reserved.
+ * Copyright (c) 2017 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/netinet/tcp_stacks/sack_filter.c
+++ b/sys/netinet/tcp_stacks/sack_filter.c
@ -1,7 +1,5 @@
 /*-
- * Copyright (c) 2017
- *	Netflix Inc.
- *      All rights reserved.
+ * Copyright (c) 2017 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/netinet/tcp_stacks/sack_filter.h
+++ b/sys/netinet/tcp_stacks/sack_filter.h
@ -1,9 +1,7 @@
 #ifndef __sack_filter_h__
 #define __sack_filter_h__
 /*-
- * Copyright (c) 2017
- *	Netflix Inc.
- *      All rights reserved.
+ * Copyright (c) 2017 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/netinet/tcp_stacks/tcp_rack.h
+++ b/sys/netinet/tcp_stacks/tcp_rack.h
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2016
- *	Netflix Inc.  All rights reserved.
+ * Copyright (c) 2016 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/sys/boot.h
+++ b/sys/sys/boot.h
@ -1,9 +1,9 @@
 /*-
 * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 *
- * Copyright (c) 2018 Netflix
 * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
 * All rights reserved.
+ * Copyright (c) 2018 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/sys/efiio.h
+++ b/sys/sys/efiio.h
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2016 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/sys/kern_prefetch.h
+++ b/sys/sys/kern_prefetch.h
@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2016-2018 Netflix Inc.
+ * Copyright (c) 2016-2018 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/tests/callout_test.h
+++ b/sys/tests/callout_test.h
@ -1,8 +1,7 @@
 #ifndef __callout_test_h__
 #define __callout_test_h__
 /*-
- * Copyright (c) 2015
- *	Netflix Incorporated, All rights reserved.
+ * Copyright (c) 2015 Netflix, Inc.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/tests/callout_test/callout_test.c
+++ b/sys/tests/callout_test/callout_test.c
@ -1,5 +1,6 @@
 /*-
- * Copyright (c) 2015 Netflix Inc. All rights reserved.
+ * Copyright (c) 2015 Netflix, Inc.
+ *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
--- a/sys/tests/framework/kern_testfrwk.c
+++ b/sys/tests/framework/kern_testfrwk.c
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015
- *	Netflix Incorporated, All rights reserved.
+ * Copyright (c) 2015 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/sys/tests/kern_testfrwk.h
+++ b/sys/tests/kern_testfrwk.h
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015
- *	Netflix Incorporated, All rights reserved.
+ * Copyright (c) 2015 Netflix, Inc.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/usr.sbin/efibootmgr/efibootmgr.8
+++ b/usr.sbin/efibootmgr/efibootmgr.8
@ -1,5 +1,5 @@
-.\" Copyright (c) 2017-2018 Netflix, Inc
-.\" All rights reserved.
+.\"
+.\" Copyright (c) 2017-2018 Netflix, Inc.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- a/usr.sbin/efibootmgr/efibootmgr.c
+++ b/usr.sbin/efibootmgr/efibootmgr.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017-2018 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/usr.sbin/efidp/efidp.8
+++ b/usr.sbin/efidp/efidp.8
@ -1,5 +1,5 @@
-.\" Copyright (c) 2017 Netflix, Inc
-.\" All rights reserved.
+.\"
+.\" Copyright (c) 2017 Netflix, Inc.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- a/usr.sbin/efidp/efidp.c
+++ b/usr.sbin/efidp/efidp.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2016 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/usr.sbin/efivar/efiutil.c
+++ b/usr.sbin/efivar/efiutil.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/usr.sbin/efivar/efiutil.h
+++ b/usr.sbin/efivar/efiutil.h
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2017 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/usr.sbin/efivar/efivar.8
+++ b/usr.sbin/efivar/efivar.8
@ -1,5 +1,5 @@
-.\" Copyright (c) 2017 Netflix, Inc
-.\" All rights reserved.
+.\"
+.\" Copyright (c) 2017 Netflix, Inc.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- a/usr.sbin/efivar/efivar.c
+++ b/usr.sbin/efivar/efivar.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2016 Netflix, Inc.
- * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/usr.sbin/mpsutil/mps_cmd.c
+++ b/usr.sbin/mpsutil/mps_cmd.c
@ -2,7 +2,6 @@
 * Copyright (c) 2015 Baptiste Daroussin <bapt@FreeBSD.org>
 *
 * Copyright (c) 2015 Netflix, Inc.
- * All rights reserved.
 * Written by: Scott Long <scottl@freebsd.org>
 *
 * Copyright (c) 2008 Yahoo!, Inc.
--- a/usr.sbin/mpsutil/mps_debug.c
+++ b/usr.sbin/mpsutil/mps_debug.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2018 Netflix, Inc.
- * All rights reserved.
 * Written by: Scott Long <scottl@freebsd.org>
 *
 * Redistribution and use in source and binary forms, with or without
--- a/usr.sbin/mpsutil/mps_show.c
+++ b/usr.sbin/mpsutil/mps_show.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2015 Netflix, Inc.
- * All rights reserved.
 * Written by: Scott Long <scottl@freebsd.org>
 *
 * Copyright (c) 2008 Yahoo!, Inc.
--- a/usr.sbin/mpsutil/mpsutil.c
+++ b/usr.sbin/mpsutil/mpsutil.c
@ -1,6 +1,5 @@
 /*-
 * Copyright (c) 2015 Netflix, Inc.
- * All rights reserved.
 * Written by: Scott Long <scottl@freebsd.org>
 *
 * Copyright (c) 2008 Yahoo!, Inc.
--- a/usr.sbin/pmcstat/pmcpl_annotate_cg.c
+++ b/usr.sbin/pmcstat/pmcpl_annotate_cg.c
@ -3,9 +3,11 @@
 *
 * Copyright (c) 2005-2007, Joseph Koshy
 * Copyright (c) 2007 The FreeBSD Foundation
- * Copyright (c) 2014, Adrian Chadd, Netflix Inc.
 * All rights reserved.
 *
+ * Copyright (c) 2014 Netflix, Inc.
+ * Written by: Adrian Chadd <adrian@FreeBSD.org>
+ *
 * Portions of this software were developed by A. Joseph Koshy under
 * sponsorship from the FreeBSD Foundation and Google, Inc.
 *
--- a/usr.sbin/pmcstat/pmcpl_annotate_cg.h
+++ b/usr.sbin/pmcstat/pmcpl_annotate_cg.h
@ -3,9 +3,11 @@
 *
 * Copyright (c) 2005-2007, Joseph Koshy
 * Copyright (c) 2007 The FreeBSD Foundation
- * Copyright (c) 2014, Adrian Chadd, Netflix Inc.
 * All rights reserved.
 *
+ * Copyright (c) 2014 Netflix, Inc.
+ * Written by: Adrian Chadd <adrian@FreeBSD.org>
+ *
 * Portions of this software were developed by A. Joseph Koshy under
 * sponsorship from the FreeBSD Foundation and Google, Inc.
 *
--- a/usr.sbin/pmcstudy/eval_expr.c
+++ b/usr.sbin/pmcstudy/eval_expr.c
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 Netflix Inc.
- * All rights reserved.
+ * Copyright (c) 2015 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/usr.sbin/pmcstudy/eval_expr.h
+++ b/usr.sbin/pmcstudy/eval_expr.h
@ -1,8 +1,7 @@
 #ifndef __eval_expr_h__
 #define __eval_expr_h__
 /*-
- * Copyright (c) 2015 Netflix Inc.
- * All rights reserved.
+ * Copyright (c) 2015 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
--- a/usr.sbin/pmcstudy/pmcstudy.8
+++ b/usr.sbin/pmcstudy/pmcstudy.8
@ -1,5 +1,5 @@
-.\" Copyright (c) 2015
-.\"		Netflix Inc.
+.\"
+.\" Copyright (c) 2015 Netflix, Inc.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
--- a/usr.sbin/pmcstudy/pmcstudy.c
+++ b/usr.sbin/pmcstudy/pmcstudy.c
@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2014, 2015 Netflix Inc.
- * All rights reserved.
+ * Copyright (c) 2014-2015 Netflix, Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions