Author: mp
Date: Sun Apr  8 01:32:56 2018
New Revision: 332263
URL: https://svnweb.freebsd.org/changeset/base/332263

Log:
  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 <vd...@vmware.com>
  Approved by: VMware legal via Mark Peek <markp...@vmware.com>
  Differential Revision:  https://reviews.freebsd.org/D14979

Added:
  head/sys/dev/vmware/vmci/LICENSE   (contents, props changed)
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  Sun Apr  8 00:56:19 2018        (r332262)
+++ head/share/man/man4/vmci.4  Sun Apr  8 01:32:56 2018        (r332263)
@@ -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)
 .\"

Added: head/sys/dev/vmware/vmci/LICENSE
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/dev/vmware/vmci/LICENSE    Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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.

Modified: head/sys/dev/vmware/vmci/vmci.c
==============================================================================
--- head/sys/dev/vmware/vmci/vmci.c     Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci.c     Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  */

Modified: head/sys/dev/vmware/vmci/vmci.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci.h     Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci.h     Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_call_defs.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_call_defs.h   Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_call_defs.h   Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_datagram.c
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_datagram.c    Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_datagram.c    Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  */

Modified: head/sys/dev/vmware/vmci/vmci_datagram.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_datagram.h    Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_datagram.h    Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_defs.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_defs.h        Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_defs.h        Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_doorbell.c
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_doorbell.c    Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_doorbell.c    Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  */

Modified: head/sys/dev/vmware/vmci/vmci_doorbell.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_doorbell.h    Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_doorbell.h    Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_driver.c
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_driver.c      Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_driver.c      Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  */

Modified: head/sys/dev/vmware/vmci/vmci_driver.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_driver.h      Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_driver.h      Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_event.c
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_event.c       Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_event.c       Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  */

Modified: head/sys/dev/vmware/vmci/vmci_event.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_event.h       Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_event.h       Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_hashtable.c
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_hashtable.c   Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_hashtable.c   Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  */

Modified: head/sys/dev/vmware/vmci/vmci_hashtable.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_hashtable.h   Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_hashtable.h   Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_kernel_api.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_kernel_api.h  Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_kernel_api.h  Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_kernel_api_1.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_kernel_api_1.h        Sun Apr  8 00:56:19 
2018        (r332262)
+++ head/sys/dev/vmware/vmci/vmci_kernel_api_1.h        Sun Apr  8 01:32:56 
2018        (r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_kernel_api_2.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_kernel_api_2.h        Sun Apr  8 00:56:19 
2018        (r332262)
+++ head/sys/dev/vmware/vmci/vmci_kernel_api_2.h        Sun Apr  8 01:32:56 
2018        (r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_kernel_defs.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_kernel_defs.h Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_kernel_defs.h Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_kernel_if.c
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_kernel_if.c   Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_kernel_if.c   Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  */

Modified: head/sys/dev/vmware/vmci/vmci_kernel_if.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_kernel_if.h   Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_kernel_if.h   Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_qpair.c
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_qpair.c       Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_qpair.c       Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  */

Modified: head/sys/dev/vmware/vmci/vmci_queue.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_queue.h       Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_queue.h       Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_queue_pair.c
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_queue_pair.c  Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_queue_pair.c  Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  */

Modified: head/sys/dev/vmware/vmci/vmci_queue_pair.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_queue_pair.h  Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_queue_pair.h  Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_resource.c
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_resource.c    Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_resource.c    Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  */

Modified: head/sys/dev/vmware/vmci/vmci_resource.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_resource.h    Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_resource.h    Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/dev/vmware/vmci/vmci_utils.h
==============================================================================
--- head/sys/dev/vmware/vmci/vmci_utils.h       Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/dev/vmware/vmci/vmci_utils.h       Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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)
  *

Modified: head/sys/modules/vmware/vmci/Makefile
==============================================================================
--- head/sys/modules/vmware/vmci/Makefile       Sun Apr  8 00:56:19 2018        
(r332262)
+++ head/sys/modules/vmware/vmci/Makefile       Sun Apr  8 01:32:56 2018        
(r332263)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to