svn commit: r343755 - in head: lib/libefivar sbin/devmatch sbin/nvmecontrol sbin/nvmecontrol/modules/wdc share/man/man4 share/man/man9 stand/efi/libefi stand/efi/loader stand/forth stand/i386/libi3...
Rodney W. Grimes
freebsd at pdx.rh.CN85.dnsmgr.net
Mon Feb 4 21:58:27 UTC 2019
> Author: imp
> Date: Mon Feb 4 21:28:25 2019
> New Revision: 343755
> URL: https://svnweb.freebsd.org/changeset/base/343755
>
> Log:
> 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.
Thank you, I think you missed at least one though.
And a few other comments inline, I defanitly think we need to pull
what was done here into an update of style(9), including the proper
way to attribute "work done for hire".
> 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)
>
> Modified:
> head/lib/libefivar/efi-osdep.h
> head/lib/libefivar/efivar-dp-format.c
> head/lib/libefivar/efivar-dp-parse.c
> head/lib/libefivar/efivar-dp-xlate.c
> head/lib/libefivar/efivar-dp.h
> head/lib/libefivar/efivar.3
> head/lib/libefivar/efivar.c
> head/lib/libefivar/efivar.h
> head/lib/libefivar/uefi-dplib.h
> head/lib/libefivar/uefi-dputil.c
> head/sbin/devmatch/devmatch.8
> head/sbin/devmatch/devmatch.c
> head/sbin/nvmecontrol/modules/wdc/wdc.c
> head/sbin/nvmecontrol/nc_util.c
> head/sbin/nvmecontrol/ns.c
> head/sbin/nvmecontrol/nvmecontrol_ext.h
> head/sbin/nvmecontrol/power.c
> head/share/man/man4/nda.4
> head/share/man/man9/kern_testfrwk.9
> head/stand/efi/libefi/efienv.c
> head/stand/efi/libefi/env.c
> head/stand/efi/libefi/wchar.c
> head/stand/efi/loader/main.c
> head/stand/forth/efi.4th
> head/stand/i386/libi386/biospci.c
> head/stand/libsa/abort.c
> head/stand/libsa/xlocale_private.h
> head/sys/cam/nvme/nvme_all.c
> head/sys/cam/nvme/nvme_all.h
> head/sys/cam/nvme/nvme_da.c
> head/sys/crypto/aesni/aesencdec.h
> head/sys/dev/efidev/efidev.c
> head/sys/dev/nvme/nvme_sim.c
> head/sys/dev/tcp_log/tcp_log_dev.c
> head/sys/dev/tcp_log/tcp_log_dev.h
> head/sys/kern/subr_boot.c
> head/sys/netinet/tcp_hpts.c
> head/sys/netinet/tcp_hpts.h
> head/sys/netinet/tcp_log_buf.c
> head/sys/netinet/tcp_log_buf.h
> head/sys/netinet/tcp_stacks/rack.c
> head/sys/netinet/tcp_stacks/rack_bbr_common.h
> head/sys/netinet/tcp_stacks/sack_filter.c
> head/sys/netinet/tcp_stacks/sack_filter.h
> head/sys/netinet/tcp_stacks/tcp_rack.h
> head/sys/sys/boot.h
> head/sys/sys/efiio.h
> head/sys/sys/kern_prefetch.h
> head/sys/tests/callout_test.h
> head/sys/tests/callout_test/callout_test.c
> head/sys/tests/framework/kern_testfrwk.c
> head/sys/tests/kern_testfrwk.h
> head/usr.sbin/efibootmgr/efibootmgr.8
> head/usr.sbin/efibootmgr/efibootmgr.c
> head/usr.sbin/efidp/efidp.8
> head/usr.sbin/efidp/efidp.c
> head/usr.sbin/efivar/efiutil.c
> head/usr.sbin/efivar/efiutil.h
> head/usr.sbin/efivar/efivar.8
> head/usr.sbin/efivar/efivar.c
> head/usr.sbin/mpsutil/mps_cmd.c
> head/usr.sbin/mpsutil/mps_debug.c
> head/usr.sbin/mpsutil/mps_show.c
> head/usr.sbin/mpsutil/mpsutil.c
> head/usr.sbin/pmcstat/pmcpl_annotate_cg.c
> head/usr.sbin/pmcstat/pmcpl_annotate_cg.h
> head/usr.sbin/pmcstudy/eval_expr.c
> head/usr.sbin/pmcstudy/eval_expr.h
> head/usr.sbin/pmcstudy/pmcstudy.8
> head/usr.sbin/pmcstudy/pmcstudy.c
>
> Modified: head/lib/libefivar/efi-osdep.h
> ==============================================================================
> --- head/lib/libefivar/efi-osdep.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/lib/libefivar/efi-osdep.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/lib/libefivar/efivar-dp-format.c
> ==============================================================================
> --- head/lib/libefivar/efivar-dp-format.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/lib/libefivar/efivar-dp-format.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/lib/libefivar/efivar-dp-parse.c
> ==============================================================================
> --- head/lib/libefivar/efivar-dp-parse.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/lib/libefivar/efivar-dp-parse.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/lib/libefivar/efivar-dp-xlate.c
> ==============================================================================
> --- head/lib/libefivar/efivar-dp-xlate.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/lib/libefivar/efivar-dp-xlate.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/lib/libefivar/efivar-dp.h
> ==============================================================================
> --- head/lib/libefivar/efivar-dp.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/lib/libefivar/efivar-dp.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/lib/libefivar/efivar.3
> ==============================================================================
> --- head/lib/libefivar/efivar.3 Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/lib/libefivar/efivar.3 Mon Feb 4 21:28:25 2019 (r343755)
> @@ -1,3 +1,4 @@
> +.\"
> .\" Copyright 2016 Netflix, Inc.
> .\" All rights reserved.
I do not see any other copyright near this, so shouldnt this
All rights reserved.
gone away too?
> .\"
>
> Modified: head/lib/libefivar/efivar.c
> ==============================================================================
> --- head/lib/libefivar/efivar.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/lib/libefivar/efivar.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/lib/libefivar/efivar.h
> ==============================================================================
> --- head/lib/libefivar/efivar.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/lib/libefivar/efivar.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/lib/libefivar/uefi-dplib.h
> ==============================================================================
> --- head/lib/libefivar/uefi-dplib.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/lib/libefivar/uefi-dplib.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/lib/libefivar/uefi-dputil.c
> ==============================================================================
> --- head/lib/libefivar/uefi-dputil.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/lib/libefivar/uefi-dputil.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sbin/devmatch/devmatch.8
> ==============================================================================
> --- head/sbin/devmatch/devmatch.8 Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sbin/devmatch/devmatch.8 Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sbin/devmatch/devmatch.c
> ==============================================================================
> --- head/sbin/devmatch/devmatch.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sbin/devmatch/devmatch.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sbin/nvmecontrol/modules/wdc/wdc.c
> ==============================================================================
> --- head/sbin/nvmecontrol/modules/wdc/wdc.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sbin/nvmecontrol/modules/wdc/wdc.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sbin/nvmecontrol/nc_util.c
> ==============================================================================
> --- head/sbin/nvmecontrol/nc_util.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sbin/nvmecontrol/nc_util.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sbin/nvmecontrol/ns.c
> ==============================================================================
> --- head/sbin/nvmecontrol/ns.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sbin/nvmecontrol/ns.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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 at FreeBSD.org>
> *
> * Redistribution and use in source and binary forms, with or without
>
> Modified: head/sbin/nvmecontrol/nvmecontrol_ext.h
> ==============================================================================
> --- head/sbin/nvmecontrol/nvmecontrol_ext.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sbin/nvmecontrol/nvmecontrol_ext.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sbin/nvmecontrol/power.c
> ==============================================================================
> --- head/sbin/nvmecontrol/power.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sbin/nvmecontrol/power.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/share/man/man4/nda.4
> ==============================================================================
> --- head/share/man/man4/nda.4 Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/share/man/man4/nda.4 Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/share/man/man9/kern_testfrwk.9
> ==============================================================================
> --- head/share/man/man9/kern_testfrwk.9 Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/share/man/man9/kern_testfrwk.9 Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/stand/efi/libefi/efienv.c
> ==============================================================================
> --- head/stand/efi/libefi/efienv.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/stand/efi/libefi/efienv.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/stand/efi/libefi/env.c
> ==============================================================================
> --- head/stand/efi/libefi/env.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/stand/efi/libefi/env.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/stand/efi/libefi/wchar.c
> ==============================================================================
> --- head/stand/efi/libefi/wchar.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/stand/efi/libefi/wchar.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/stand/efi/loader/main.c
> ==============================================================================
> --- head/stand/efi/loader/main.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/stand/efi/loader/main.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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.
> + *
I like this solution to clearly making it not an "All rights reserved"
situation. In the email we exchanged about changes to style(9) we
should probably add something about this form/style.
> * Redistribution and use in source and binary forms, with or without
> * modification, are permitted provided that the following conditions
> * are met:
>
> Modified: head/stand/forth/efi.4th
> ==============================================================================
> --- head/stand/forth/efi.4th Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/stand/forth/efi.4th Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/stand/i386/libi386/biospci.c
> ==============================================================================
> --- head/stand/i386/libi386/biospci.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/stand/i386/libi386/biospci.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -1,7 +1,8 @@
> /*-
> * Copyright (c) 1998 Michael Smith <msmith at 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
>
> Modified: head/stand/libsa/abort.c
> ==============================================================================
> --- head/stand/libsa/abort.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/stand/libsa/abort.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/stand/libsa/xlocale_private.h
> ==============================================================================
> --- head/stand/libsa/xlocale_private.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/stand/libsa/xlocale_private.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/cam/nvme/nvme_all.c
> ==============================================================================
> --- head/sys/cam/nvme/nvme_all.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/cam/nvme/nvme_all.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/cam/nvme/nvme_all.h
> ==============================================================================
> --- head/sys/cam/nvme/nvme_all.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/cam/nvme/nvme_all.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/cam/nvme/nvme_da.c
> ==============================================================================
> --- head/sys/cam/nvme/nvme_da.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/cam/nvme/nvme_da.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/crypto/aesni/aesencdec.h
> ==============================================================================
> --- head/sys/crypto/aesni/aesencdec.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/crypto/aesni/aesencdec.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -1,7 +1,8 @@
> /*-
> * Copyright 2013 John-Mark Gurney <jmg at 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
>
> Modified: head/sys/dev/efidev/efidev.c
> ==============================================================================
> --- head/sys/dev/efidev/efidev.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/dev/efidev/efidev.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/dev/nvme/nvme_sim.c
> ==============================================================================
> --- head/sys/dev/nvme/nvme_sim.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/dev/nvme/nvme_sim.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/dev/tcp_log/tcp_log_dev.c
> ==============================================================================
> --- head/sys/dev/tcp_log/tcp_log_dev.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/dev/tcp_log/tcp_log_dev.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/dev/tcp_log/tcp_log_dev.h
> ==============================================================================
> --- head/sys/dev/tcp_log/tcp_log_dev.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/dev/tcp_log/tcp_log_dev.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/kern/subr_boot.c
> ==============================================================================
> --- head/sys/kern/subr_boot.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/kern/subr_boot.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -10,7 +10,7 @@
> * Copyright (c) 2014 Roger Pau Monn? <roger.pau at citrix.com>
> * All Rights Reserved.
> * Copyright (c) 2018 Kyle Evans <kevans at 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
>
> Modified: head/sys/netinet/tcp_hpts.c
> ==============================================================================
> --- head/sys/netinet/tcp_hpts.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/netinet/tcp_hpts.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/netinet/tcp_hpts.h
> ==============================================================================
> --- head/sys/netinet/tcp_hpts.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/netinet/tcp_hpts.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/netinet/tcp_log_buf.c
> ==============================================================================
> --- head/sys/netinet/tcp_log_buf.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/netinet/tcp_log_buf.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/netinet/tcp_log_buf.h
> ==============================================================================
> --- head/sys/netinet/tcp_log_buf.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/netinet/tcp_log_buf.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/netinet/tcp_stacks/rack.c
> ==============================================================================
> --- head/sys/netinet/tcp_stacks/rack.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/netinet/tcp_stacks/rack.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/netinet/tcp_stacks/rack_bbr_common.h
> ==============================================================================
> --- head/sys/netinet/tcp_stacks/rack_bbr_common.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/netinet/tcp_stacks/rack_bbr_common.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/netinet/tcp_stacks/sack_filter.c
> ==============================================================================
> --- head/sys/netinet/tcp_stacks/sack_filter.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/netinet/tcp_stacks/sack_filter.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/netinet/tcp_stacks/sack_filter.h
> ==============================================================================
> --- head/sys/netinet/tcp_stacks/sack_filter.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/netinet/tcp_stacks/sack_filter.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/netinet/tcp_stacks/tcp_rack.h
> ==============================================================================
> --- head/sys/netinet/tcp_stacks/tcp_rack.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/netinet/tcp_stacks/tcp_rack.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/sys/boot.h
> ==============================================================================
> --- head/sys/sys/boot.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/sys/boot.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -1,9 +1,9 @@
> /*-
> * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
> *
> - * Copyright (c) 2018 Netflix
> * Copyright (c) 2014 Roger Pau Monn? <roger.pau at citrix.com>
> * All rights reserved.
To be consistent with how you did this else where a
*
belongs here.
> + * Copyright (c) 2018 Netflix, Inc.
> *
> * Redistribution and use in source and binary forms, with or without
> * modification, are permitted provided that the following conditions
>
> Modified: head/sys/sys/efiio.h
> ==============================================================================
> --- head/sys/sys/efiio.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/sys/efiio.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/sys/kern_prefetch.h
> ==============================================================================
> --- head/sys/sys/kern_prefetch.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/sys/kern_prefetch.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/tests/callout_test.h
> ==============================================================================
> --- head/sys/tests/callout_test.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/tests/callout_test.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/tests/callout_test/callout_test.c
> ==============================================================================
> --- head/sys/tests/callout_test/callout_test.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/tests/callout_test/callout_test.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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:
>
> Modified: head/sys/tests/framework/kern_testfrwk.c
> ==============================================================================
> --- head/sys/tests/framework/kern_testfrwk.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/tests/framework/kern_testfrwk.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/sys/tests/kern_testfrwk.h
> ==============================================================================
> --- head/sys/tests/kern_testfrwk.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/sys/tests/kern_testfrwk.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/usr.sbin/efibootmgr/efibootmgr.8
> ==============================================================================
> --- head/usr.sbin/efibootmgr/efibootmgr.8 Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/efibootmgr/efibootmgr.8 Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/usr.sbin/efibootmgr/efibootmgr.c
> ==============================================================================
> --- head/usr.sbin/efibootmgr/efibootmgr.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/efibootmgr/efibootmgr.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/usr.sbin/efidp/efidp.8
> ==============================================================================
> --- head/usr.sbin/efidp/efidp.8 Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/efidp/efidp.8 Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/usr.sbin/efidp/efidp.c
> ==============================================================================
> --- head/usr.sbin/efidp/efidp.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/efidp/efidp.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/usr.sbin/efivar/efiutil.c
> ==============================================================================
> --- head/usr.sbin/efivar/efiutil.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/efivar/efiutil.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/usr.sbin/efivar/efiutil.h
> ==============================================================================
> --- head/usr.sbin/efivar/efiutil.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/efivar/efiutil.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/usr.sbin/efivar/efivar.8
> ==============================================================================
> --- head/usr.sbin/efivar/efivar.8 Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/efivar/efivar.8 Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/usr.sbin/efivar/efivar.c
> ==============================================================================
> --- head/usr.sbin/efivar/efivar.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/efivar/efivar.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/usr.sbin/mpsutil/mps_cmd.c
> ==============================================================================
> --- head/usr.sbin/mpsutil/mps_cmd.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/mpsutil/mps_cmd.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -2,7 +2,6 @@
> * Copyright (c) 2015 Baptiste Daroussin <bapt at FreeBSD.org>
> *
> * Copyright (c) 2015 Netflix, Inc.
> - * All rights reserved.
> * Written by: Scott Long <scottl at freebsd.org>
> *
> * Copyright (c) 2008 Yahoo!, Inc.
>
> Modified: head/usr.sbin/mpsutil/mps_debug.c
> ==============================================================================
> --- head/usr.sbin/mpsutil/mps_debug.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/mpsutil/mps_debug.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -1,6 +1,5 @@
> /*-
> * Copyright (c) 2018 Netflix, Inc.
> - * All rights reserved.
> * Written by: Scott Long <scottl at freebsd.org>
> *
> * Redistribution and use in source and binary forms, with or without
>
> Modified: head/usr.sbin/mpsutil/mps_show.c
> ==============================================================================
> --- head/usr.sbin/mpsutil/mps_show.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/mpsutil/mps_show.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -1,6 +1,5 @@
> /*-
> * Copyright (c) 2015 Netflix, Inc.
> - * All rights reserved.
> * Written by: Scott Long <scottl at freebsd.org>
> *
> * Copyright (c) 2008 Yahoo!, Inc.
>
> Modified: head/usr.sbin/mpsutil/mpsutil.c
> ==============================================================================
> --- head/usr.sbin/mpsutil/mpsutil.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/mpsutil/mpsutil.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -1,6 +1,5 @@
> /*-
> * Copyright (c) 2015 Netflix, Inc.
> - * All rights reserved.
> * Written by: Scott Long <scottl at freebsd.org>
> *
> * Copyright (c) 2008 Yahoo!, Inc.
>
> Modified: head/usr.sbin/pmcstat/pmcpl_annotate_cg.c
> ==============================================================================
> --- head/usr.sbin/pmcstat/pmcpl_annotate_cg.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/pmcstat/pmcpl_annotate_cg.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -3,8 +3,10 @@
> *
> * 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 at FreeBSD.org>
I also like this, it is good form for expressing works done for hire.
> *
> * Portions of this software were developed by A. Joseph Koshy under
> * sponsorship from the FreeBSD Foundation and Google, Inc.
>
> Modified: head/usr.sbin/pmcstat/pmcpl_annotate_cg.h
> ==============================================================================
> --- head/usr.sbin/pmcstat/pmcpl_annotate_cg.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/pmcstat/pmcpl_annotate_cg.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -3,8 +3,10 @@
> *
> * 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 at FreeBSD.org>
> *
> * Portions of this software were developed by A. Joseph Koshy under
> * sponsorship from the FreeBSD Foundation and Google, Inc.
>
> Modified: head/usr.sbin/pmcstudy/eval_expr.c
> ==============================================================================
> --- head/usr.sbin/pmcstudy/eval_expr.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/pmcstudy/eval_expr.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/usr.sbin/pmcstudy/eval_expr.h
> ==============================================================================
> --- head/usr.sbin/pmcstudy/eval_expr.h Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/pmcstudy/eval_expr.h Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/usr.sbin/pmcstudy/pmcstudy.8
> ==============================================================================
> --- head/usr.sbin/pmcstudy/pmcstudy.8 Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/pmcstudy/pmcstudy.8 Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
> Modified: head/usr.sbin/pmcstudy/pmcstudy.c
> ==============================================================================
> --- head/usr.sbin/pmcstudy/pmcstudy.c Mon Feb 4 21:16:15 2019 (r343754)
> +++ head/usr.sbin/pmcstudy/pmcstudy.c Mon Feb 4 21:28:25 2019 (r343755)
> @@ -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
>
>
--
Rod Grimes rgrimes at freebsd.org
More information about the svn-src-head
mailing list