From 8c302b2e8685a9887a4be126b2ff32c41fbce1e1 Mon Sep 17 00:00:00 2001 From: Mark Peek Date: Tue, 27 Mar 2018 06:33:00 +0000 Subject: [PATCH] Rectify VMCI SPDX license Approved by: Vishnu Dasa --- share/man/man4/vmci.4 | 2 +- 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 | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/share/man/man4/vmci.4 b/share/man/man4/vmci.4 index 6b28098204d..0e9494553ec 100644 --- a/share/man/man4/vmci.4 +++ b/share/man/man4/vmci.4 @@ -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 diff --git a/sys/dev/vmware/vmci/vmci.c b/sys/dev/vmware/vmci/vmci.c index 443424f903d..a4ddbc6be17 100644 --- a/sys/dev/vmware/vmci/vmci.c +++ b/sys/dev/vmware/vmci/vmci.c @@ -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. */ diff --git a/sys/dev/vmware/vmci/vmci.h b/sys/dev/vmware/vmci/vmci.h index 4177bd474c9..e92f33ed005 100644 --- a/sys/dev/vmware/vmci/vmci.h +++ b/sys/dev/vmware/vmci/vmci.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_call_defs.h b/sys/dev/vmware/vmci/vmci_call_defs.h index fadb200ca6b..903a24b6c54 100644 --- a/sys/dev/vmware/vmci/vmci_call_defs.h +++ b/sys/dev/vmware/vmci/vmci_call_defs.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_datagram.c b/sys/dev/vmware/vmci/vmci_datagram.c index a8b64b83e47..a5554fe3dd2 100644 --- a/sys/dev/vmware/vmci/vmci_datagram.c +++ b/sys/dev/vmware/vmci/vmci_datagram.c @@ -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. */ diff --git a/sys/dev/vmware/vmci/vmci_datagram.h b/sys/dev/vmware/vmci/vmci_datagram.h index eab47300ab0..75369403787 100644 --- a/sys/dev/vmware/vmci/vmci_datagram.h +++ b/sys/dev/vmware/vmci/vmci_datagram.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_defs.h b/sys/dev/vmware/vmci/vmci_defs.h index 9afa7208e15..3d24f5e947a 100644 --- a/sys/dev/vmware/vmci/vmci_defs.h +++ b/sys/dev/vmware/vmci/vmci_defs.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_doorbell.c b/sys/dev/vmware/vmci/vmci_doorbell.c index 61c7f67a608..e5c7d71e1d4 100644 --- a/sys/dev/vmware/vmci/vmci_doorbell.c +++ b/sys/dev/vmware/vmci/vmci_doorbell.c @@ -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. */ diff --git a/sys/dev/vmware/vmci/vmci_doorbell.h b/sys/dev/vmware/vmci/vmci_doorbell.h index 4741c0e1ff9..5838be8d650 100644 --- a/sys/dev/vmware/vmci/vmci_doorbell.h +++ b/sys/dev/vmware/vmci/vmci_doorbell.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_driver.c b/sys/dev/vmware/vmci/vmci_driver.c index 943c2b57743..bc7a03242d0 100644 --- a/sys/dev/vmware/vmci/vmci_driver.c +++ b/sys/dev/vmware/vmci/vmci_driver.c @@ -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. */ diff --git a/sys/dev/vmware/vmci/vmci_driver.h b/sys/dev/vmware/vmci/vmci_driver.h index 890770f4942..aa7d117ce35 100644 --- a/sys/dev/vmware/vmci/vmci_driver.h +++ b/sys/dev/vmware/vmci/vmci_driver.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_event.c b/sys/dev/vmware/vmci/vmci_event.c index 8373bbc8f66..8d649bfe21d 100644 --- a/sys/dev/vmware/vmci/vmci_event.c +++ b/sys/dev/vmware/vmci/vmci_event.c @@ -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. */ diff --git a/sys/dev/vmware/vmci/vmci_event.h b/sys/dev/vmware/vmci/vmci_event.h index 9614e86e836..af713371879 100644 --- a/sys/dev/vmware/vmci/vmci_event.h +++ b/sys/dev/vmware/vmci/vmci_event.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_hashtable.c b/sys/dev/vmware/vmci/vmci_hashtable.c index 31e1846769a..f9eb6636352 100644 --- a/sys/dev/vmware/vmci/vmci_hashtable.c +++ b/sys/dev/vmware/vmci/vmci_hashtable.c @@ -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. */ diff --git a/sys/dev/vmware/vmci/vmci_hashtable.h b/sys/dev/vmware/vmci/vmci_hashtable.h index 0ff542852a0..a83288ad688 100644 --- a/sys/dev/vmware/vmci/vmci_hashtable.h +++ b/sys/dev/vmware/vmci/vmci_hashtable.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_kernel_api.h b/sys/dev/vmware/vmci/vmci_kernel_api.h index fec08035986..8f984485db3 100644 --- a/sys/dev/vmware/vmci/vmci_kernel_api.h +++ b/sys/dev/vmware/vmci/vmci_kernel_api.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_kernel_api_1.h b/sys/dev/vmware/vmci/vmci_kernel_api_1.h index e706ab36758..8fa77c480b6 100644 --- a/sys/dev/vmware/vmci/vmci_kernel_api_1.h +++ b/sys/dev/vmware/vmci/vmci_kernel_api_1.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_kernel_api_2.h b/sys/dev/vmware/vmci/vmci_kernel_api_2.h index cb66b7cceab..ad41666a4a0 100644 --- a/sys/dev/vmware/vmci/vmci_kernel_api_2.h +++ b/sys/dev/vmware/vmci/vmci_kernel_api_2.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_kernel_defs.h b/sys/dev/vmware/vmci/vmci_kernel_defs.h index 46eefd99289..a2c4f7424a7 100644 --- a/sys/dev/vmware/vmci/vmci_kernel_defs.h +++ b/sys/dev/vmware/vmci/vmci_kernel_defs.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_kernel_if.c b/sys/dev/vmware/vmci/vmci_kernel_if.c index b5d5ad9714c..4f5e44b8f6c 100644 --- a/sys/dev/vmware/vmci/vmci_kernel_if.c +++ b/sys/dev/vmware/vmci/vmci_kernel_if.c @@ -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. */ diff --git a/sys/dev/vmware/vmci/vmci_kernel_if.h b/sys/dev/vmware/vmci/vmci_kernel_if.h index 4d3247c124c..24b876061ad 100644 --- a/sys/dev/vmware/vmci/vmci_kernel_if.h +++ b/sys/dev/vmware/vmci/vmci_kernel_if.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_qpair.c b/sys/dev/vmware/vmci/vmci_qpair.c index 7b2d97d4b73..7644e2900b3 100644 --- a/sys/dev/vmware/vmci/vmci_qpair.c +++ b/sys/dev/vmware/vmci/vmci_qpair.c @@ -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. */ diff --git a/sys/dev/vmware/vmci/vmci_queue.h b/sys/dev/vmware/vmci/vmci_queue.h index 55a05643dd2..9840d44acad 100644 --- a/sys/dev/vmware/vmci/vmci_queue.h +++ b/sys/dev/vmware/vmci/vmci_queue.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_queue_pair.c b/sys/dev/vmware/vmci/vmci_queue_pair.c index 851008904e8..a5d312ebbc5 100644 --- a/sys/dev/vmware/vmci/vmci_queue_pair.c +++ b/sys/dev/vmware/vmci/vmci_queue_pair.c @@ -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. */ diff --git a/sys/dev/vmware/vmci/vmci_queue_pair.h b/sys/dev/vmware/vmci/vmci_queue_pair.h index f0b8203917a..c4f33538d64 100644 --- a/sys/dev/vmware/vmci/vmci_queue_pair.h +++ b/sys/dev/vmware/vmci/vmci_queue_pair.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_resource.c b/sys/dev/vmware/vmci/vmci_resource.c index 193490d71e4..219fc0af301 100644 --- a/sys/dev/vmware/vmci/vmci_resource.c +++ b/sys/dev/vmware/vmci/vmci_resource.c @@ -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. */ diff --git a/sys/dev/vmware/vmci/vmci_resource.h b/sys/dev/vmware/vmci/vmci_resource.h index 32d2303c529..ff4e97c6901 100644 --- a/sys/dev/vmware/vmci/vmci_resource.h +++ b/sys/dev/vmware/vmci/vmci_resource.h @@ -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$ */ diff --git a/sys/dev/vmware/vmci/vmci_utils.h b/sys/dev/vmware/vmci/vmci_utils.h index d5a8bff98be..ab48fe91f52 100644 --- a/sys/dev/vmware/vmci/vmci_utils.h +++ b/sys/dev/vmware/vmci/vmci_utils.h @@ -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$ */ diff --git a/sys/modules/vmware/vmci/Makefile b/sys/modules/vmware/vmci/Makefile index ab08b967361..bbe5d3a1abe 100644 --- a/sys/modules/vmware/vmci/Makefile +++ b/sys/modules/vmware/vmci/Makefile @@ -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$