From 52467047aa7dd6d21f6303b28e4278cab2d8fe48 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 4 Feb 2019 21:28:25 +0000 Subject: [PATCH] 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) --- lib/libefivar/efi-osdep.h | 1 - lib/libefivar/efivar-dp-format.c | 1 - lib/libefivar/efivar-dp-parse.c | 1 - lib/libefivar/efivar-dp-xlate.c | 1 - lib/libefivar/efivar-dp.h | 1 - lib/libefivar/efivar.3 | 1 + lib/libefivar/efivar.c | 1 - lib/libefivar/efivar.h | 1 - lib/libefivar/uefi-dplib.h | 1 - lib/libefivar/uefi-dputil.c | 1 - sbin/devmatch/devmatch.8 | 4 +--- sbin/devmatch/devmatch.c | 3 +-- sbin/nvmecontrol/modules/wdc/wdc.c | 3 +-- sbin/nvmecontrol/nc_util.c | 3 +-- sbin/nvmecontrol/ns.c | 2 +- sbin/nvmecontrol/nvmecontrol_ext.h | 2 +- sbin/nvmecontrol/power.c | 3 +-- share/man/man4/nda.4 | 4 ++-- share/man/man9/kern_testfrwk.9 | 3 +-- stand/efi/libefi/efienv.c | 1 - stand/efi/libefi/env.c | 2 +- stand/efi/libefi/wchar.c | 2 +- stand/efi/loader/main.c | 3 ++- stand/forth/efi.4th | 4 ++-- stand/i386/libi386/biospci.c | 3 ++- stand/libsa/abort.c | 2 +- stand/libsa/xlocale_private.h | 2 +- sys/cam/nvme/nvme_all.c | 2 +- sys/cam/nvme/nvme_all.h | 2 +- sys/cam/nvme/nvme_da.c | 2 +- sys/crypto/aesni/aesencdec.h | 3 ++- sys/dev/efidev/efidev.c | 1 - sys/dev/nvme/nvme_sim.c | 2 +- sys/dev/tcp_log/tcp_log_dev.c | 3 +-- sys/dev/tcp_log/tcp_log_dev.h | 3 +-- sys/kern/subr_boot.c | 2 +- sys/netinet/tcp_hpts.c | 2 +- sys/netinet/tcp_hpts.h | 2 +- sys/netinet/tcp_log_buf.c | 3 +-- sys/netinet/tcp_log_buf.h | 3 +-- sys/netinet/tcp_stacks/rack.c | 3 +-- sys/netinet/tcp_stacks/rack_bbr_common.h | 4 +--- sys/netinet/tcp_stacks/sack_filter.c | 4 +--- sys/netinet/tcp_stacks/sack_filter.h | 4 +--- sys/netinet/tcp_stacks/tcp_rack.h | 3 +-- sys/sys/boot.h | 2 +- sys/sys/efiio.h | 1 - sys/sys/kern_prefetch.h | 2 +- sys/tests/callout_test.h | 3 +-- sys/tests/callout_test/callout_test.c | 3 ++- sys/tests/framework/kern_testfrwk.c | 3 +-- sys/tests/kern_testfrwk.h | 3 +-- usr.sbin/efibootmgr/efibootmgr.8 | 4 ++-- usr.sbin/efibootmgr/efibootmgr.c | 1 - usr.sbin/efidp/efidp.8 | 4 ++-- usr.sbin/efidp/efidp.c | 1 - usr.sbin/efivar/efiutil.c | 1 - usr.sbin/efivar/efiutil.h | 1 - usr.sbin/efivar/efivar.8 | 4 ++-- usr.sbin/efivar/efivar.c | 1 - usr.sbin/mpsutil/mps_cmd.c | 1 - usr.sbin/mpsutil/mps_debug.c | 1 - usr.sbin/mpsutil/mps_show.c | 1 - usr.sbin/mpsutil/mpsutil.c | 1 - usr.sbin/pmcstat/pmcpl_annotate_cg.c | 4 +++- usr.sbin/pmcstat/pmcpl_annotate_cg.h | 4 +++- usr.sbin/pmcstudy/eval_expr.c | 3 +-- usr.sbin/pmcstudy/eval_expr.h | 3 +-- usr.sbin/pmcstudy/pmcstudy.8 | 4 ++-- usr.sbin/pmcstudy/pmcstudy.c | 3 +-- 70 files changed, 63 insertions(+), 100 deletions(-) diff --git a/lib/libefivar/efi-osdep.h b/lib/libefivar/efi-osdep.h index 406f2ba44fde..b971eab5899d 100644 --- 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 diff --git a/lib/libefivar/efivar-dp-format.c b/lib/libefivar/efivar-dp-format.c index 41b89da0b97f..aa875dc45e70 100644 --- 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 diff --git a/lib/libefivar/efivar-dp-parse.c b/lib/libefivar/efivar-dp-parse.c index c06d9dcc7b79..3fc4fd8a62fd 100644 --- 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 diff --git a/lib/libefivar/efivar-dp-xlate.c b/lib/libefivar/efivar-dp-xlate.c index bdd8fbe25675..55be29c5b547 100644 --- 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 diff --git a/lib/libefivar/efivar-dp.h b/lib/libefivar/efivar-dp.h index 92276c3efeea..5a8db37f36fc 100644 --- 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 diff --git a/lib/libefivar/efivar.3 b/lib/libefivar/efivar.3 index 4cde5004ee28..046664abcb17 100644 --- a/lib/libefivar/efivar.3 +++ b/lib/libefivar/efivar.3 @@ -1,3 +1,4 @@ +.\" .\" Copyright 2016 Netflix, Inc. .\" All rights reserved. .\" diff --git a/lib/libefivar/efivar.c b/lib/libefivar/efivar.c index bfde632c7a84..76b83d3bbdbe 100644 --- 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 diff --git a/lib/libefivar/efivar.h b/lib/libefivar/efivar.h index 6fb75a765052..2bdf92d35690 100644 --- 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 diff --git a/lib/libefivar/uefi-dplib.h b/lib/libefivar/uefi-dplib.h index 1a1f3e256029..10f145086697 100644 --- 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 diff --git a/lib/libefivar/uefi-dputil.c b/lib/libefivar/uefi-dputil.c index 06b43f40bb04..9f1f86a25ebe 100644 --- 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 diff --git a/sbin/devmatch/devmatch.8 b/sbin/devmatch/devmatch.8 index 2d534bc402a8..bf36c276c823 100644 --- 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 diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c index 938760bec32f..d5d698576076 100644 --- 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 diff --git a/sbin/nvmecontrol/modules/wdc/wdc.c b/sbin/nvmecontrol/modules/wdc/wdc.c index e6ec249addf8..6060abbbfcd5 100644 --- 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 diff --git a/sbin/nvmecontrol/nc_util.c b/sbin/nvmecontrol/nc_util.c index 77de11fc987b..8f73256003a5 100644 --- 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 diff --git a/sbin/nvmecontrol/ns.c b/sbin/nvmecontrol/ns.c index ce762d59fb37..bb996fabdf2e 100644 --- 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 * * Redistribution and use in source and binary forms, with or without diff --git a/sbin/nvmecontrol/nvmecontrol_ext.h b/sbin/nvmecontrol/nvmecontrol_ext.h index 43042dfafdf9..d60fcd4d8a2c 100644 --- 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 diff --git a/sbin/nvmecontrol/power.c b/sbin/nvmecontrol/power.c index 3adbaf1d4eb2..7e5cac49713e 100644 --- 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 diff --git a/share/man/man4/nda.4 b/share/man/man4/nda.4 index bc1240e2c019..9e9bff5922dc 100644 --- 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 diff --git a/share/man/man9/kern_testfrwk.9 b/share/man/man9/kern_testfrwk.9 index 653cb5e89c60..76fb4535fc9c 100644 --- 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 diff --git a/stand/efi/libefi/efienv.c b/stand/efi/libefi/efienv.c index 1ee6beeb518f..06c54f80bc3c 100644 --- 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 diff --git a/stand/efi/libefi/env.c b/stand/efi/libefi/env.c index 58337c47df41..77e232343040 100644 --- 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 diff --git a/stand/efi/libefi/wchar.c b/stand/efi/libefi/wchar.c index d8d81aca4bcc..0a2b96b64f45 100644 --- 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 diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 060bc975e8d4..fb6c97ab73de 100644 --- 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: diff --git a/stand/forth/efi.4th b/stand/forth/efi.4th index 827b4348087b..abcf12cffccd 100644 --- 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 diff --git a/stand/i386/libi386/biospci.c b/stand/i386/libi386/biospci.c index e13a5b9f37ef..968533e210c4 100644 --- a/stand/i386/libi386/biospci.c +++ b/stand/i386/libi386/biospci.c @@ -1,8 +1,9 @@ /*- * Copyright (c) 1998 Michael Smith - * 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: diff --git a/stand/libsa/abort.c b/stand/libsa/abort.c index 4b3a2c7e00c2..d8f66ca0ba23 100644 --- 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 diff --git a/stand/libsa/xlocale_private.h b/stand/libsa/xlocale_private.h index 96eed3722769..074aca692550 100644 --- 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 diff --git a/sys/cam/nvme/nvme_all.c b/sys/cam/nvme/nvme_all.c index f79785f77786..d9faea1d7849 100644 --- 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 diff --git a/sys/cam/nvme/nvme_all.h b/sys/cam/nvme/nvme_all.h index e31c1e5e0d7d..2141700a9226 100644 --- 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 diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 9e2f26bec07c..9f708d6ad40d 100644 --- 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 diff --git a/sys/crypto/aesni/aesencdec.h b/sys/crypto/aesni/aesencdec.h index 80951a48aad4..73add364c0aa 100644 --- a/sys/crypto/aesni/aesencdec.h +++ b/sys/crypto/aesni/aesencdec.h @@ -1,8 +1,9 @@ /*- * Copyright 2013 John-Mark Gurney - * 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: diff --git a/sys/dev/efidev/efidev.c b/sys/dev/efidev/efidev.c index 01b6c379b0c0..b585db4f0117 100644 --- 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 diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index 424c4ecfd5dd..7593920c15fa 100644 --- 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 diff --git a/sys/dev/tcp_log/tcp_log_dev.c b/sys/dev/tcp_log/tcp_log_dev.c index c62e106da55f..bea2dd95b0dd 100644 --- 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 diff --git a/sys/dev/tcp_log/tcp_log_dev.h b/sys/dev/tcp_log/tcp_log_dev.h index 90f0364a2fed..808271f8640b 100644 --- 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 diff --git a/sys/kern/subr_boot.c b/sys/kern/subr_boot.c index 00890c3150d7..4aa135df5c83 100644 --- a/sys/kern/subr_boot.c +++ b/sys/kern/subr_boot.c @@ -10,7 +10,7 @@ * Copyright (c) 2014 Roger Pau Monné * All Rights Reserved. * Copyright (c) 2018 Kyle Evans - * 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 diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c index f3737888f3d0..74e796103f8a 100644 --- 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 diff --git a/sys/netinet/tcp_hpts.h b/sys/netinet/tcp_hpts.h index 04c867698915..ea15bc1ab320 100644 --- 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 diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c index 9dd6ee8acb1e..3225ce9c31b7 100644 --- 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 diff --git a/sys/netinet/tcp_log_buf.h b/sys/netinet/tcp_log_buf.h index e569395a1aed..0662d1b5d4ad 100644 --- 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 diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 608b6e7e15ad..975367fa7a82 100644 --- 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 diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.h b/sys/netinet/tcp_stacks/rack_bbr_common.h index d52022daee66..c3d661cfd972 100644 --- 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 diff --git a/sys/netinet/tcp_stacks/sack_filter.c b/sys/netinet/tcp_stacks/sack_filter.c index 993d5851db79..2ef0eadfa944 100644 --- 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 diff --git a/sys/netinet/tcp_stacks/sack_filter.h b/sys/netinet/tcp_stacks/sack_filter.h index 3ef0f1693f5b..3ef986209566 100644 --- 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 diff --git a/sys/netinet/tcp_stacks/tcp_rack.h b/sys/netinet/tcp_stacks/tcp_rack.h index c7132ba81893..76c3eb2e5b70 100644 --- 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 diff --git a/sys/sys/boot.h b/sys/sys/boot.h index 3cfebedff19c..68b9e1e0daf3 100644 --- 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é * 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 diff --git a/sys/sys/efiio.h b/sys/sys/efiio.h index 1e1cff67b62f..87fed9c3afd8 100644 --- 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 diff --git a/sys/sys/kern_prefetch.h b/sys/sys/kern_prefetch.h index dd6cf3fa19d7..6945132f12e0 100644 --- 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 diff --git a/sys/tests/callout_test.h b/sys/tests/callout_test.h index 2f470dc8bbca..a30b2ad95fe8 100644 --- 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 diff --git a/sys/tests/callout_test/callout_test.c b/sys/tests/callout_test/callout_test.c index c42e9decb4bb..ce585380b94a 100644 --- 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: diff --git a/sys/tests/framework/kern_testfrwk.c b/sys/tests/framework/kern_testfrwk.c index 2ef1c6f02a50..3e88faa5e8f8 100644 --- 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 diff --git a/sys/tests/kern_testfrwk.h b/sys/tests/kern_testfrwk.h index 844eea411313..dbb4733df962 100644 --- 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 diff --git a/usr.sbin/efibootmgr/efibootmgr.8 b/usr.sbin/efibootmgr/efibootmgr.8 index 689d53d200f0..c19e8f18799a 100644 --- 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 diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c index 06bd55866c69..5793388fbcc0 100644 --- 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 diff --git a/usr.sbin/efidp/efidp.8 b/usr.sbin/efidp/efidp.8 index 40bd7b945759..ad98428a97a5 100644 --- 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 diff --git a/usr.sbin/efidp/efidp.c b/usr.sbin/efidp/efidp.c index e12491ecabf5..aef154112d66 100644 --- 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 diff --git a/usr.sbin/efivar/efiutil.c b/usr.sbin/efivar/efiutil.c index 0ccf2950df2a..ff35b29bf9cc 100644 --- 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 diff --git a/usr.sbin/efivar/efiutil.h b/usr.sbin/efivar/efiutil.h index 143fd464f6ca..dbcb598c789e 100644 --- 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 diff --git a/usr.sbin/efivar/efivar.8 b/usr.sbin/efivar/efivar.8 index 7113ba931e46..215708dd8afe 100644 --- 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 diff --git a/usr.sbin/efivar/efivar.c b/usr.sbin/efivar/efivar.c index f278ecd78b6a..8146812534e4 100644 --- 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 diff --git a/usr.sbin/mpsutil/mps_cmd.c b/usr.sbin/mpsutil/mps_cmd.c index 6053c9265261..8e1e431d65f3 100644 --- a/usr.sbin/mpsutil/mps_cmd.c +++ b/usr.sbin/mpsutil/mps_cmd.c @@ -2,7 +2,6 @@ * Copyright (c) 2015 Baptiste Daroussin * * Copyright (c) 2015 Netflix, Inc. - * All rights reserved. * Written by: Scott Long * * Copyright (c) 2008 Yahoo!, Inc. diff --git a/usr.sbin/mpsutil/mps_debug.c b/usr.sbin/mpsutil/mps_debug.c index 24ddbd2cb11d..4c462ef65f6c 100644 --- 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 * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/mpsutil/mps_show.c b/usr.sbin/mpsutil/mps_show.c index 81265aacf7bb..57aed20a7d60 100644 --- 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 * * Copyright (c) 2008 Yahoo!, Inc. diff --git a/usr.sbin/mpsutil/mpsutil.c b/usr.sbin/mpsutil/mpsutil.c index cb15d0d0a566..d7209afd175f 100644 --- 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 * * Copyright (c) 2008 Yahoo!, Inc. diff --git a/usr.sbin/pmcstat/pmcpl_annotate_cg.c b/usr.sbin/pmcstat/pmcpl_annotate_cg.c index b8ad3c697cab..d6274e1f2b73 100644 --- 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 + * * Portions of this software were developed by A. Joseph Koshy under * sponsorship from the FreeBSD Foundation and Google, Inc. * diff --git a/usr.sbin/pmcstat/pmcpl_annotate_cg.h b/usr.sbin/pmcstat/pmcpl_annotate_cg.h index cf11c8de519d..afd5209ee756 100644 --- 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 + * * Portions of this software were developed by A. Joseph Koshy under * sponsorship from the FreeBSD Foundation and Google, Inc. * diff --git a/usr.sbin/pmcstudy/eval_expr.c b/usr.sbin/pmcstudy/eval_expr.c index d8999a98ab99..984e5ea72176 100644 --- 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 diff --git a/usr.sbin/pmcstudy/eval_expr.h b/usr.sbin/pmcstudy/eval_expr.h index f095513a8aa5..2c264ff711b2 100644 --- 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 diff --git a/usr.sbin/pmcstudy/pmcstudy.8 b/usr.sbin/pmcstudy/pmcstudy.8 index a3ec51ad8c1a..34d76b1de80c 100644 --- 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 diff --git a/usr.sbin/pmcstudy/pmcstudy.c b/usr.sbin/pmcstudy/pmcstudy.c index 3cf1f8e328a8..69d926a05e5d 100644 --- 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