Date: Tue, 27 Mar 2018 06:33:00 +0000 (UTC) From: Mark Peek <mp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331609 - in head: share/man/man4 sys/dev/vmware/vmci sys/modules/vmware/vmci Message-ID: <201803270633.w2R6X0Vh024356@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mp Date: Tue Mar 27 06:33:00 2018 New Revision: 331609 URL: https://svnweb.freebsd.org/changeset/base/331609 Log: Rectify VMCI SPDX license Approved by: Vishnu Dasa <vdasa@vmware.com> Modified: head/share/man/man4/vmci.4 head/sys/dev/vmware/vmci/vmci.c head/sys/dev/vmware/vmci/vmci.h head/sys/dev/vmware/vmci/vmci_call_defs.h head/sys/dev/vmware/vmci/vmci_datagram.c head/sys/dev/vmware/vmci/vmci_datagram.h head/sys/dev/vmware/vmci/vmci_defs.h head/sys/dev/vmware/vmci/vmci_doorbell.c head/sys/dev/vmware/vmci/vmci_doorbell.h head/sys/dev/vmware/vmci/vmci_driver.c head/sys/dev/vmware/vmci/vmci_driver.h head/sys/dev/vmware/vmci/vmci_event.c head/sys/dev/vmware/vmci/vmci_event.h head/sys/dev/vmware/vmci/vmci_hashtable.c head/sys/dev/vmware/vmci/vmci_hashtable.h head/sys/dev/vmware/vmci/vmci_kernel_api.h head/sys/dev/vmware/vmci/vmci_kernel_api_1.h head/sys/dev/vmware/vmci/vmci_kernel_api_2.h head/sys/dev/vmware/vmci/vmci_kernel_defs.h head/sys/dev/vmware/vmci/vmci_kernel_if.c head/sys/dev/vmware/vmci/vmci_kernel_if.h head/sys/dev/vmware/vmci/vmci_qpair.c head/sys/dev/vmware/vmci/vmci_queue.h head/sys/dev/vmware/vmci/vmci_queue_pair.c head/sys/dev/vmware/vmci/vmci_queue_pair.h head/sys/dev/vmware/vmci/vmci_resource.c head/sys/dev/vmware/vmci/vmci_resource.h head/sys/dev/vmware/vmci/vmci_utils.h head/sys/modules/vmware/vmci/Makefile Modified: head/share/man/man4/vmci.4 ============================================================================== --- head/share/man/man4/vmci.4 Tue Mar 27 05:33:44 2018 (r331608) +++ head/share/man/man4/vmci.4 Tue Mar 27 06:33:00 2018 (r331609) @@ -1,6 +1,6 @@ .\" Copyright (c) 2018 VMware, Inc. All Rights Reserved. .\" -.\" SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) +.\" SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) .\" .\" $FreeBSD$ .Dd February 10, 2018 Modified: head/sys/dev/vmware/vmci/vmci.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci.c Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci.c Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ /* Driver for VMware Virtual Machine Communication Interface (VMCI) device. */ Modified: head/sys/dev/vmware/vmci/vmci.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_call_defs.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_call_defs.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_call_defs.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_datagram.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_datagram.c Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_datagram.c Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ /* This file implements the VMCI Simple Datagram API on the host. */ Modified: head/sys/dev/vmware/vmci/vmci_datagram.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_datagram.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_datagram.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_defs.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_defs.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_defs.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_doorbell.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_doorbell.c Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_doorbell.c Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ /* This file implements the VMCI doorbell API. */ Modified: head/sys/dev/vmware/vmci/vmci_doorbell.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_doorbell.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_doorbell.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_driver.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_driver.c Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_driver.c Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ /* VMCI initialization. */ Modified: head/sys/dev/vmware/vmci/vmci_driver.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_driver.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_driver.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_event.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_event.c Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_event.c Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ /* This file implements VMCI Event code. */ Modified: head/sys/dev/vmware/vmci/vmci_event.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_event.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_event.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_hashtable.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_hashtable.c Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_hashtable.c Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ /* Implementation of the VMCI Hashtable. */ Modified: head/sys/dev/vmware/vmci/vmci_hashtable.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_hashtable.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_hashtable.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_kernel_api.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_kernel_api.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_kernel_api.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_kernel_api_1.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_kernel_api_1.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_kernel_api_1.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_kernel_api_2.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_kernel_api_2.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_kernel_api_2.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_kernel_defs.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_kernel_defs.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_kernel_defs.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_kernel_if.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_kernel_if.c Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_kernel_if.c Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ /* This file implements defines and helper functions. */ Modified: head/sys/dev/vmware/vmci/vmci_kernel_if.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_kernel_if.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_kernel_if.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_qpair.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_qpair.c Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_qpair.c Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ /* This file implements Queue accessor methods. */ Modified: head/sys/dev/vmware/vmci/vmci_queue.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_queue.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_queue.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_queue_pair.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_queue_pair.c Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_queue_pair.c Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ /* VMCI QueuePair API implementation. */ Modified: head/sys/dev/vmware/vmci/vmci_queue_pair.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_queue_pair.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_queue_pair.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_resource.c ============================================================================== --- head/sys/dev/vmware/vmci/vmci_resource.c Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_resource.c Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) */ /* Implementation of the VMCI Resource Access Control API. */ Modified: head/sys/dev/vmware/vmci/vmci_resource.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_resource.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_resource.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/dev/vmware/vmci/vmci_utils.h ============================================================================== --- head/sys/dev/vmware/vmci/vmci_utils.h Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/dev/vmware/vmci/vmci_utils.h Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2018 VMware, Inc. All Rights Reserved. * - * SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) + * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) * * $FreeBSD$ */ Modified: head/sys/modules/vmware/vmci/Makefile ============================================================================== --- head/sys/modules/vmware/vmci/Makefile Tue Mar 27 05:33:44 2018 (r331608) +++ head/sys/modules/vmware/vmci/Makefile Tue Mar 27 06:33:00 2018 (r331609) @@ -1,7 +1,7 @@ # # Copyright (c) 2018 VMware, Inc. All Rights Reserved. # -# SPDX-License-Identifier: (BSD-2-Clause AND GPL-2.0) +# SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0) # # $FreeBSD$
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803270633.w2R6X0Vh024356>