From 3eeb75112272ef9ef244a00bc73beef3a146856a Mon Sep 17 00:00:00 2001 From: Mark Peek Date: Sun, 8 Apr 2018 01:32:56 +0000 Subject: [PATCH] Update VMCI license based on comments from core, the FreeBSD Foundation, and VMware legal: - Add a dual BSD-2 Clause/GPLv2 LICENSE file in the VMCI directory - Remove the use of "All Rights Reserved" - Per best practice, remove copyright/license info from Makefile Reviewed by: imp, emaste, jhb, Vishnu Dasa Approved by: VMware legal via Mark Peek Differential Revision: https://reviews.freebsd.org/D14979 --- share/man/man4/vmci.4 | 2 +- sys/dev/vmware/vmci/LICENSE | 51 +++++++++++++++++++++++++ sys/dev/vmware/vmci/vmci.c | 2 +- sys/dev/vmware/vmci/vmci.h | 2 +- sys/dev/vmware/vmci/vmci_call_defs.h | 2 +- sys/dev/vmware/vmci/vmci_datagram.c | 2 +- sys/dev/vmware/vmci/vmci_datagram.h | 2 +- sys/dev/vmware/vmci/vmci_defs.h | 2 +- sys/dev/vmware/vmci/vmci_doorbell.c | 2 +- sys/dev/vmware/vmci/vmci_doorbell.h | 2 +- sys/dev/vmware/vmci/vmci_driver.c | 2 +- sys/dev/vmware/vmci/vmci_driver.h | 2 +- sys/dev/vmware/vmci/vmci_event.c | 2 +- sys/dev/vmware/vmci/vmci_event.h | 2 +- sys/dev/vmware/vmci/vmci_hashtable.c | 2 +- sys/dev/vmware/vmci/vmci_hashtable.h | 2 +- sys/dev/vmware/vmci/vmci_kernel_api.h | 2 +- sys/dev/vmware/vmci/vmci_kernel_api_1.h | 2 +- sys/dev/vmware/vmci/vmci_kernel_api_2.h | 2 +- sys/dev/vmware/vmci/vmci_kernel_defs.h | 2 +- sys/dev/vmware/vmci/vmci_kernel_if.c | 2 +- sys/dev/vmware/vmci/vmci_kernel_if.h | 2 +- sys/dev/vmware/vmci/vmci_qpair.c | 2 +- sys/dev/vmware/vmci/vmci_queue.h | 2 +- sys/dev/vmware/vmci/vmci_queue_pair.c | 2 +- sys/dev/vmware/vmci/vmci_queue_pair.h | 2 +- sys/dev/vmware/vmci/vmci_resource.c | 2 +- sys/dev/vmware/vmci/vmci_resource.h | 2 +- sys/dev/vmware/vmci/vmci_utils.h | 2 +- sys/modules/vmware/vmci/Makefile | 5 --- 30 files changed, 79 insertions(+), 33 deletions(-) create mode 100644 sys/dev/vmware/vmci/LICENSE diff --git a/share/man/man4/vmci.4 b/share/man/man4/vmci.4 index 0e9494553ec..241aa507596 100644 --- a/share/man/man4/vmci.4 +++ b/share/man/man4/vmci.4 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2018 VMware, Inc. All Rights Reserved. +.\" Copyright (c) 2018 VMware, Inc. .\" .\" SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) .\" diff --git a/sys/dev/vmware/vmci/LICENSE b/sys/dev/vmware/vmci/LICENSE new file mode 100644 index 00000000000..a736cc1324a --- /dev/null +++ b/sys/dev/vmware/vmci/LICENSE @@ -0,0 +1,51 @@ +$FreeBSD$ + +These files are provided under a dual BSD-2 Clause/GPLv2 license. When +using or redistributing this file, you may do so under either license. + +BSD-2 Clause License + +Copyright (c) 2018 VMware, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +GPL License Summary + +Copyright (c) 2018 VMware, Inc. + +This program is free software; you can redistribute it and/or modify +it under the terms of version 2 of the GNU General Public License as +published by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. +The full GNU General Public License is included in this distribution +in the file called LICENSE.GPL. diff --git a/sys/dev/vmware/vmci/vmci.c b/sys/dev/vmware/vmci/vmci.c index a4ddbc6be17..dc029419e20 100644 --- a/sys/dev/vmware/vmci/vmci.c +++ b/sys/dev/vmware/vmci/vmci.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ diff --git a/sys/dev/vmware/vmci/vmci.h b/sys/dev/vmware/vmci/vmci.h index e92f33ed005..ca55bd395bb 100644 --- a/sys/dev/vmware/vmci/vmci.h +++ b/sys/dev/vmware/vmci/vmci.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_call_defs.h b/sys/dev/vmware/vmci/vmci_call_defs.h index 903a24b6c54..d33e95d6f72 100644 --- a/sys/dev/vmware/vmci/vmci_call_defs.h +++ b/sys/dev/vmware/vmci/vmci_call_defs.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_datagram.c b/sys/dev/vmware/vmci/vmci_datagram.c index a5554fe3dd2..0149dd62271 100644 --- a/sys/dev/vmware/vmci/vmci_datagram.c +++ b/sys/dev/vmware/vmci/vmci_datagram.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ diff --git a/sys/dev/vmware/vmci/vmci_datagram.h b/sys/dev/vmware/vmci/vmci_datagram.h index 75369403787..8b48c973a90 100644 --- a/sys/dev/vmware/vmci/vmci_datagram.h +++ b/sys/dev/vmware/vmci/vmci_datagram.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_defs.h b/sys/dev/vmware/vmci/vmci_defs.h index 3d24f5e947a..94dfe44d159 100644 --- a/sys/dev/vmware/vmci/vmci_defs.h +++ b/sys/dev/vmware/vmci/vmci_defs.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_doorbell.c b/sys/dev/vmware/vmci/vmci_doorbell.c index e5c7d71e1d4..226c69b8483 100644 --- a/sys/dev/vmware/vmci/vmci_doorbell.c +++ b/sys/dev/vmware/vmci/vmci_doorbell.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ diff --git a/sys/dev/vmware/vmci/vmci_doorbell.h b/sys/dev/vmware/vmci/vmci_doorbell.h index 5838be8d650..a819ff342e9 100644 --- a/sys/dev/vmware/vmci/vmci_doorbell.h +++ b/sys/dev/vmware/vmci/vmci_doorbell.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_driver.c b/sys/dev/vmware/vmci/vmci_driver.c index bc7a03242d0..c742cc46c74 100644 --- a/sys/dev/vmware/vmci/vmci_driver.c +++ b/sys/dev/vmware/vmci/vmci_driver.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ diff --git a/sys/dev/vmware/vmci/vmci_driver.h b/sys/dev/vmware/vmci/vmci_driver.h index aa7d117ce35..5a814c70e54 100644 --- a/sys/dev/vmware/vmci/vmci_driver.h +++ b/sys/dev/vmware/vmci/vmci_driver.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_event.c b/sys/dev/vmware/vmci/vmci_event.c index 8d649bfe21d..9a932340a7b 100644 --- a/sys/dev/vmware/vmci/vmci_event.c +++ b/sys/dev/vmware/vmci/vmci_event.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ diff --git a/sys/dev/vmware/vmci/vmci_event.h b/sys/dev/vmware/vmci/vmci_event.h index af713371879..7afaf361bde 100644 --- a/sys/dev/vmware/vmci/vmci_event.h +++ b/sys/dev/vmware/vmci/vmci_event.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_hashtable.c b/sys/dev/vmware/vmci/vmci_hashtable.c index f9eb6636352..c8559b008c1 100644 --- a/sys/dev/vmware/vmci/vmci_hashtable.c +++ b/sys/dev/vmware/vmci/vmci_hashtable.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ diff --git a/sys/dev/vmware/vmci/vmci_hashtable.h b/sys/dev/vmware/vmci/vmci_hashtable.h index a83288ad688..1c4c9c462b8 100644 --- a/sys/dev/vmware/vmci/vmci_hashtable.h +++ b/sys/dev/vmware/vmci/vmci_hashtable.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_kernel_api.h b/sys/dev/vmware/vmci/vmci_kernel_api.h index 8f984485db3..85f0a23ea33 100644 --- a/sys/dev/vmware/vmci/vmci_kernel_api.h +++ b/sys/dev/vmware/vmci/vmci_kernel_api.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_kernel_api_1.h b/sys/dev/vmware/vmci/vmci_kernel_api_1.h index 8fa77c480b6..eac29bd1581 100644 --- a/sys/dev/vmware/vmci/vmci_kernel_api_1.h +++ b/sys/dev/vmware/vmci/vmci_kernel_api_1.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_kernel_api_2.h b/sys/dev/vmware/vmci/vmci_kernel_api_2.h index ad41666a4a0..df38a5717a8 100644 --- a/sys/dev/vmware/vmci/vmci_kernel_api_2.h +++ b/sys/dev/vmware/vmci/vmci_kernel_api_2.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_kernel_defs.h b/sys/dev/vmware/vmci/vmci_kernel_defs.h index a2c4f7424a7..521bd8a960c 100644 --- a/sys/dev/vmware/vmci/vmci_kernel_defs.h +++ b/sys/dev/vmware/vmci/vmci_kernel_defs.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_kernel_if.c b/sys/dev/vmware/vmci/vmci_kernel_if.c index 4f5e44b8f6c..851c4c9df21 100644 --- a/sys/dev/vmware/vmci/vmci_kernel_if.c +++ b/sys/dev/vmware/vmci/vmci_kernel_if.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ diff --git a/sys/dev/vmware/vmci/vmci_kernel_if.h b/sys/dev/vmware/vmci/vmci_kernel_if.h index 24b876061ad..fc23eefe98e 100644 --- a/sys/dev/vmware/vmci/vmci_kernel_if.h +++ b/sys/dev/vmware/vmci/vmci_kernel_if.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_qpair.c b/sys/dev/vmware/vmci/vmci_qpair.c index 7644e2900b3..acaef7256f5 100644 --- a/sys/dev/vmware/vmci/vmci_qpair.c +++ b/sys/dev/vmware/vmci/vmci_qpair.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ diff --git a/sys/dev/vmware/vmci/vmci_queue.h b/sys/dev/vmware/vmci/vmci_queue.h index 9840d44acad..966af2fdf64 100644 --- a/sys/dev/vmware/vmci/vmci_queue.h +++ b/sys/dev/vmware/vmci/vmci_queue.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_queue_pair.c b/sys/dev/vmware/vmci/vmci_queue_pair.c index a5d312ebbc5..65ae00c8d16 100644 --- a/sys/dev/vmware/vmci/vmci_queue_pair.c +++ b/sys/dev/vmware/vmci/vmci_queue_pair.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ diff --git a/sys/dev/vmware/vmci/vmci_queue_pair.h b/sys/dev/vmware/vmci/vmci_queue_pair.h index c4f33538d64..70e02c4ee27 100644 --- a/sys/dev/vmware/vmci/vmci_queue_pair.h +++ b/sys/dev/vmware/vmci/vmci_queue_pair.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_resource.c b/sys/dev/vmware/vmci/vmci_resource.c index 219fc0af301..060484f5a1d 100644 --- a/sys/dev/vmware/vmci/vmci_resource.c +++ b/sys/dev/vmware/vmci/vmci_resource.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ diff --git a/sys/dev/vmware/vmci/vmci_resource.h b/sys/dev/vmware/vmci/vmci_resource.h index ff4e97c6901..057a96aef43 100644 --- a/sys/dev/vmware/vmci/vmci_resource.h +++ b/sys/dev/vmware/vmci/vmci_resource.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/dev/vmware/vmci/vmci_utils.h b/sys/dev/vmware/vmci/vmci_utils.h index ab48fe91f52..b4cefa96a7f 100644 --- a/sys/dev/vmware/vmci/vmci_utils.h +++ b/sys/dev/vmware/vmci/vmci_utils.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2018 VMware, Inc. All Rights Reserved. + * Copyright (c) 2018 VMware, Inc. * * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * diff --git a/sys/modules/vmware/vmci/Makefile b/sys/modules/vmware/vmci/Makefile index bbe5d3a1abe..09b6aadf689 100644 --- a/sys/modules/vmware/vmci/Makefile +++ b/sys/modules/vmware/vmci/Makefile @@ -1,8 +1,3 @@ -# -# Copyright (c) 2018 VMware, Inc. All Rights Reserved. -# -# SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) -# # $FreeBSD$ .PATH: ${SRCTOP}/sys/dev/vmware/vmci