* [PATCH 0/2] update license and copyright
@ 2023-03-28 2:08 Junfeng Guo
2023-03-28 2:08 ` [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3 Junfeng Guo
` (2 more replies)
0 siblings, 3 replies; 38+ messages in thread
From: Junfeng Guo @ 2023-03-28 2:08 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing; +Cc: dev, Junfeng Guo
This patch set contains:
1. switch copyright from MIT to BSD-3 for GVE base code.
2. remove MIT license exception
3. add maintainers
4. update copyright holders for GVE
Junfeng Guo (2):
net/gve: switch copyright from MIT to BSD-3
net/gve: update copyright holders
.mailmap | 1 +
MAINTAINERS | 3 +++
drivers/net/gve/base/gve.h | 32 ++++++++++++++++++++++++++---
drivers/net/gve/base/gve_adminq.c | 32 ++++++++++++++++++++++++++---
drivers/net/gve/base/gve_adminq.h | 32 ++++++++++++++++++++++++++---
drivers/net/gve/base/gve_desc.h | 32 ++++++++++++++++++++++++++---
drivers/net/gve/base/gve_desc_dqo.h | 32 ++++++++++++++++++++++++++---
drivers/net/gve/base/gve_osdep.h | 31 ++++++++++++++++++++++++++--
drivers/net/gve/base/gve_register.h | 32 ++++++++++++++++++++++++++---
drivers/net/gve/gve_ethdev.c | 32 +++++++++++++++++++++++++++--
drivers/net/gve/gve_ethdev.h | 32 +++++++++++++++++++++++++++--
drivers/net/gve/gve_logs.h | 32 +++++++++++++++++++++++++++--
drivers/net/gve/gve_rx.c | 32 +++++++++++++++++++++++++++--
drivers/net/gve/gve_tx.c | 32 +++++++++++++++++++++++++++--
drivers/net/gve/meson.build | 31 +++++++++++++++++++++++++++-
license/exceptions.txt | 1 -
16 files changed, 387 insertions(+), 32 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
2023-03-28 2:08 [PATCH 0/2] update license and copyright Junfeng Guo
@ 2023-03-28 2:08 ` Junfeng Guo
2023-03-28 8:51 ` Ferruh Yigit
2023-03-28 8:55 ` Ferruh Yigit
2023-03-28 2:08 ` [PATCH 2/2] net/gve: update copyright holders Junfeng Guo
2023-03-28 9:28 ` [PATCH v2 0/3] update license and " Junfeng Guo
2 siblings, 2 replies; 38+ messages in thread
From: Junfeng Guo @ 2023-03-28 2:08 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing
Cc: dev, Junfeng Guo, Rushil Gupta, Joshua Washington, Jeroen de Borst
Switch copyright from MIT to BSD-3 for GVE base code.
In the meantime, remove MIT license exception for GVE driver.
Also update the maintainers for GVE driver.
Signed-off-by: Rushil Gupta <rushilg@google.com>
Signed-off-by: Joshua Washington <joshwash@google.com>
Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Signed-off-by: Jeroen de Borst <jeroendb@google.com>
---
.mailmap | 1 +
MAINTAINERS | 3 +++
drivers/net/gve/base/gve.h | 32 ++++++++++++++++++++++++++---
drivers/net/gve/base/gve_adminq.c | 32 ++++++++++++++++++++++++++---
drivers/net/gve/base/gve_adminq.h | 32 ++++++++++++++++++++++++++---
drivers/net/gve/base/gve_desc.h | 32 ++++++++++++++++++++++++++---
drivers/net/gve/base/gve_desc_dqo.h | 32 ++++++++++++++++++++++++++---
drivers/net/gve/base/gve_osdep.h | 31 ++++++++++++++++++++++++++--
drivers/net/gve/base/gve_register.h | 32 ++++++++++++++++++++++++++---
license/exceptions.txt | 1 -
10 files changed, 207 insertions(+), 21 deletions(-)
diff --git a/.mailmap b/.mailmap
index dc30369117..9d66fa727c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -588,6 +588,7 @@ Jens Freimann <jfreimann@redhat.com> <jfreiman@redhat.com>
Jeremy Plsek <jplsek@iol.unh.edu>
Jeremy Spewock <jspewock@iol.unh.edu>
Jerin Jacob <jerinj@marvell.com> <jerin.jacob@caviumnetworks.com> <jerinjacobk@gmail.com>
+Jeroen de Borst <jeroendb@google.com>
Jerome Jutteau <jerome.jutteau@outscale.com>
Jerry Hao OS <jerryhao@os.amperecomputing.com>
Jerry Lilijun <jerry.lilijun@huawei.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index 1a33ad8592..988c7aecfa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini
Google Virtual Ethernet
M: Junfeng Guo <junfeng.guo@intel.com>
+M: Jeroen de Borst <jeroendb@google.com>
+M: Rushil Gupta <rushilg@google.com>
+M: Joshua Washington <joshwash@google.com>
F: drivers/net/gve/
F: doc/guides/nics/gve.rst
F: doc/guides/nics/features/gve.ini
diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h
index 2dc4507acb..ac0fc1472e 100644
--- a/drivers/net/gve/base/gve.h
+++ b/drivers/net/gve/base/gve.h
@@ -1,6 +1,32 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2022-2023 Google LLC
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * 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 HOLDER 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.
*/
#ifndef _GVE_H_
diff --git a/drivers/net/gve/base/gve_adminq.c b/drivers/net/gve/base/gve_adminq.c
index e745b709b2..778d3f9416 100644
--- a/drivers/net/gve/base/gve_adminq.c
+++ b/drivers/net/gve/base/gve_adminq.c
@@ -1,6 +1,32 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2022-2023 Google LLC
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * 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 HOLDER 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.
*/
#include "../gve_ethdev.h"
diff --git a/drivers/net/gve/base/gve_adminq.h b/drivers/net/gve/base/gve_adminq.h
index 05550119de..e76d33f9a4 100644
--- a/drivers/net/gve/base/gve_adminq.h
+++ b/drivers/net/gve/base/gve_adminq.h
@@ -1,6 +1,32 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2022-2023 Google LLC
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * 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 HOLDER 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.
*/
#ifndef _GVE_ADMINQ_H
diff --git a/drivers/net/gve/base/gve_desc.h b/drivers/net/gve/base/gve_desc.h
index 006b36442f..d1f1d54aed 100644
--- a/drivers/net/gve/base/gve_desc.h
+++ b/drivers/net/gve/base/gve_desc.h
@@ -1,6 +1,32 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2022-2023 Google LLC
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * 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 HOLDER 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.
*/
/* GVE Transmit Descriptor formats */
diff --git a/drivers/net/gve/base/gve_desc_dqo.h b/drivers/net/gve/base/gve_desc_dqo.h
index ee1afdecb8..a0b2eb1be0 100644
--- a/drivers/net/gve/base/gve_desc_dqo.h
+++ b/drivers/net/gve/base/gve_desc_dqo.h
@@ -1,6 +1,32 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2022-2023 Google LLC
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * 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 HOLDER 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.
*/
/* GVE DQO Descriptor formats */
diff --git a/drivers/net/gve/base/gve_osdep.h b/drivers/net/gve/base/gve_osdep.h
index 7cb73002f4..4862c525f7 100644
--- a/drivers/net/gve/base/gve_osdep.h
+++ b/drivers/net/gve/base/gve_osdep.h
@@ -1,5 +1,32 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2022-2023 Google LLC
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * 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 HOLDER 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.
*/
#ifndef _GVE_OSDEP_H_
diff --git a/drivers/net/gve/base/gve_register.h b/drivers/net/gve/base/gve_register.h
index c674167f31..c2419c7031 100644
--- a/drivers/net/gve/base/gve_register.h
+++ b/drivers/net/gve/base/gve_register.h
@@ -1,6 +1,32 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2022-2023 Google LLC
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * 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 HOLDER 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.
*/
#ifndef _GVE_REGISTER_H_
diff --git a/license/exceptions.txt b/license/exceptions.txt
index 1ded290eee..1bd4dbf8f7 100644
--- a/license/exceptions.txt
+++ b/license/exceptions.txt
@@ -16,5 +16,4 @@ SPDX Identifier TB Approval Date GB Approval Date File name
2.BSD-2-Clause 10/23/2019 12/18/2019 lib/eal/windows/include/getopt.h
3.ISC AND
BSD-2-Clause 10/23/2019 12/18/2019 lib/eal/windows/getopt.c
-4. MIT 10/19/2022 10/18/2022 drivers/net/gve/base/*
---------------------------------------------------------------------------------------------------
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH 2/2] net/gve: update copyright holders
2023-03-28 2:08 [PATCH 0/2] update license and copyright Junfeng Guo
2023-03-28 2:08 ` [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3 Junfeng Guo
@ 2023-03-28 2:08 ` Junfeng Guo
2023-03-28 8:56 ` Ferruh Yigit
2023-03-28 9:28 ` [PATCH v2 0/3] update license and " Junfeng Guo
2 siblings, 1 reply; 38+ messages in thread
From: Junfeng Guo @ 2023-03-28 2:08 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing
Cc: dev, Junfeng Guo, Rushil Gupta, Joshua Washington, Jeroen de Borst
Add Google LLC as one of the copyright holders for GVE.
Signed-off-by: Rushil Gupta <rushilg@google.com>
Signed-off-by: Joshua Washington <joshwash@google.com>
Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Signed-off-by: Jeroen de Borst <jeroendb@google.com>
---
drivers/net/gve/gve_ethdev.c | 32 ++++++++++++++++++++++++++++++--
drivers/net/gve/gve_ethdev.h | 32 ++++++++++++++++++++++++++++++--
drivers/net/gve/gve_logs.h | 32 ++++++++++++++++++++++++++++++--
drivers/net/gve/gve_rx.c | 32 ++++++++++++++++++++++++++++++--
drivers/net/gve/gve_tx.c | 32 ++++++++++++++++++++++++++++++--
drivers/net/gve/meson.build | 31 ++++++++++++++++++++++++++++++-
6 files changed, 180 insertions(+), 11 deletions(-)
diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c
index cf28a4a3b7..1b8f0fde8f 100644
--- a/drivers/net/gve/gve_ethdev.c
+++ b/drivers/net/gve/gve_ethdev.c
@@ -1,5 +1,33 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * 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 HOLDER 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.
*/
#include "gve_ethdev.h"
diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h
index 42a02cf5d4..f600c02932 100644
--- a/drivers/net/gve/gve_ethdev.h
+++ b/drivers/net/gve/gve_ethdev.h
@@ -1,5 +1,33 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * 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 HOLDER 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.
*/
#ifndef _GVE_ETHDEV_H_
diff --git a/drivers/net/gve/gve_logs.h b/drivers/net/gve/gve_logs.h
index 0d02da46e1..a784ac5799 100644
--- a/drivers/net/gve/gve_logs.h
+++ b/drivers/net/gve/gve_logs.h
@@ -1,5 +1,33 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * 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 HOLDER 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.
*/
#ifndef _GVE_LOGS_H_
diff --git a/drivers/net/gve/gve_rx.c b/drivers/net/gve/gve_rx.c
index 8d8f94efff..b8d28a315d 100644
--- a/drivers/net/gve/gve_rx.c
+++ b/drivers/net/gve/gve_rx.c
@@ -1,5 +1,33 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * 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 HOLDER 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.
*/
#include "gve_ethdev.h"
diff --git a/drivers/net/gve/gve_tx.c b/drivers/net/gve/gve_tx.c
index fee3b939c7..968a8a6c99 100644
--- a/drivers/net/gve/gve_tx.c
+++ b/drivers/net/gve/gve_tx.c
@@ -1,5 +1,33 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * 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 HOLDER 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.
*/
#include "gve_ethdev.h"
diff --git a/drivers/net/gve/meson.build b/drivers/net/gve/meson.build
index af0010c01c..70f082756e 100644
--- a/drivers/net/gve/meson.build
+++ b/drivers/net/gve/meson.build
@@ -1,5 +1,34 @@
+#
# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2022 Intel Corporation
+#
+# Copyright (c) 2022-2023 Google LLC
+# Copyright (c) 2022-2023 Intel Corporation
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# 2. 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.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors
+# may be used to endorse or promote products derived from this software without
+# specific prior written permission.
+#
+# 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 HOLDER 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.
+#
if is_windows
build = false
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
2023-03-28 2:08 ` [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3 Junfeng Guo
@ 2023-03-28 8:51 ` Ferruh Yigit
2023-03-28 8:57 ` Guo, Junfeng
2023-03-28 8:55 ` Ferruh Yigit
1 sibling, 1 reply; 38+ messages in thread
From: Ferruh Yigit @ 2023-03-28 8:51 UTC (permalink / raw)
To: Junfeng Guo, qi.z.zhang, jingjing.wu, beilei.xing
Cc: dev, Rushil Gupta, Joshua Washington, Jeroen de Borst
On 3/28/2023 3:08 AM, Junfeng Guo wrote:
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini
>
> Google Virtual Ethernet
> M: Junfeng Guo <junfeng.guo@intel.com>
> +M: Jeroen de Borst <jeroendb@google.com>
> +M: Rushil Gupta <rushilg@google.com>
> +M: Joshua Washington <joshwash@google.com>
> F: drivers/net/gve/
> F: doc/guides/nics/gve.rst
> F: doc/guides/nics/features/gve.ini
Can you please separate the maintainers' file update into a different patch?
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
2023-03-28 2:08 ` [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3 Junfeng Guo
2023-03-28 8:51 ` Ferruh Yigit
@ 2023-03-28 8:55 ` Ferruh Yigit
2023-03-28 9:06 ` Guo, Junfeng
1 sibling, 1 reply; 38+ messages in thread
From: Ferruh Yigit @ 2023-03-28 8:55 UTC (permalink / raw)
To: Junfeng Guo, qi.z.zhang, jingjing.wu, beilei.xing
Cc: dev, Rushil Gupta, Joshua Washington, Jeroen de Borst
On 3/28/2023 3:08 AM, Junfeng Guo wrote:
> Switch copyright from MIT to BSD-3 for GVE base code.
> In the meantime, remove MIT license exception for GVE driver.
> Also update the maintainers for GVE driver.
>
I guess you are switching 'license' from MIT to BSD-3, not copyright.
Copyright holder is still Google/Intel etc..
Can you please update patch title & commit log accordingly?
> Signed-off-by: Rushil Gupta <rushilg@google.com>
> Signed-off-by: Joshua Washington <joshwash@google.com>
> Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
> Signed-off-by: Jeroen de Borst <jeroendb@google.com>
<...>
> diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h
> index 2dc4507acb..ac0fc1472e 100644
> --- a/drivers/net/gve/base/gve.h
> +++ b/drivers/net/gve/base/gve.h
> @@ -1,6 +1,32 @@
> -/* SPDX-License-Identifier: MIT
> - * Google Virtual Ethernet (gve) driver
> - * Copyright (C) 2015-2022 Google, Inc.
> +/*
> + * SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright (c) 2022-2023 Google LLC
> + *
> + * Redistribution and use in source and binary forms, with or without modification,
> + * are permitted provided that the following conditions are met:
> + *
> + * 1. Redistributions of source code must retain the above copyright notice, this
> + * list of conditions and the following disclaimer.
> + *
> + * 2. 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.
> + *
> + * 3. Neither the name of the copyright holder nor the names of its contributors
> + * may be used to endorse or promote products derived from this software without
> + * specific prior written permission.
> + *
> + * 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 HOLDER 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.
> */
Why not using SPDX tag for new BSD-3 License, but add whole license to
the files? We have SPDX tag to prevent this.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 2/2] net/gve: update copyright holders
2023-03-28 2:08 ` [PATCH 2/2] net/gve: update copyright holders Junfeng Guo
@ 2023-03-28 8:56 ` Ferruh Yigit
2023-03-28 9:35 ` Guo, Junfeng
0 siblings, 1 reply; 38+ messages in thread
From: Ferruh Yigit @ 2023-03-28 8:56 UTC (permalink / raw)
To: Junfeng Guo, qi.z.zhang, jingjing.wu, beilei.xing
Cc: dev, Rushil Gupta, Joshua Washington, Jeroen de Borst
On 3/28/2023 3:08 AM, Junfeng Guo wrote:
> Add Google LLC as one of the copyright holders for GVE.
>
> Signed-off-by: Rushil Gupta <rushilg@google.com>
> Signed-off-by: Joshua Washington <joshwash@google.com>
> Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
> Signed-off-by: Jeroen de Borst <jeroendb@google.com>
> ---
> drivers/net/gve/gve_ethdev.c | 32 ++++++++++++++++++++++++++++++--
> drivers/net/gve/gve_ethdev.h | 32 ++++++++++++++++++++++++++++++--
> drivers/net/gve/gve_logs.h | 32 ++++++++++++++++++++++++++++++--
> drivers/net/gve/gve_rx.c | 32 ++++++++++++++++++++++++++++++--
> drivers/net/gve/gve_tx.c | 32 ++++++++++++++++++++++++++++++--
> drivers/net/gve/meson.build | 31 ++++++++++++++++++++++++++++++-
> 6 files changed, 180 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c
> index cf28a4a3b7..1b8f0fde8f 100644
> --- a/drivers/net/gve/gve_ethdev.c
> +++ b/drivers/net/gve/gve_ethdev.c
> @@ -1,5 +1,33 @@
> -/* SPDX-License-Identifier: BSD-3-Clause
> - * Copyright(C) 2022 Intel Corporation
> +/*
> + * SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright (c) 2022-2023 Google LLC
> + * Copyright (c) 2022-2023 Intel Corporation
> + *
> + * Redistribution and use in source and binary forms, with or without modification,
> + * are permitted provided that the following conditions are met:
> + *
> + * 1. Redistributions of source code must retain the above copyright notice, this
> + * list of conditions and the following disclaimer.
> + *
> + * 2. 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.
> + *
> + * 3. Neither the name of the copyright holder nor the names of its contributors
> + * may be used to endorse or promote products derived from this software without
> + * specific prior written permission.
> + *
> + * 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 HOLDER 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.
> */
Can you please separate the patches that updates license and copyright?
^ permalink raw reply [flat|nested] 38+ messages in thread
* RE: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
2023-03-28 8:51 ` Ferruh Yigit
@ 2023-03-28 8:57 ` Guo, Junfeng
0 siblings, 0 replies; 38+ messages in thread
From: Guo, Junfeng @ 2023-03-28 8:57 UTC (permalink / raw)
To: Ferruh Yigit, Zhang, Qi Z, Wu, Jingjing, Xing, Beilei
Cc: dev, Rushil Gupta, Joshua Washington, Jeroen de Borst
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@amd.com>
> Sent: Tuesday, March 28, 2023 16:51
> To: Guo, Junfeng <junfeng.guo@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Xing,
> Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Rushil Gupta <rushilg@google.com>; Joshua
> Washington <joshwash@google.com>; Jeroen de Borst
> <jeroendb@google.com>
> Subject: Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
>
> On 3/28/2023 3:08 AM, Junfeng Guo wrote:
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini
> >
> > Google Virtual Ethernet
> > M: Junfeng Guo <junfeng.guo@intel.com>
> > +M: Jeroen de Borst <jeroendb@google.com>
> > +M: Rushil Gupta <rushilg@google.com>
> > +M: Joshua Washington <joshwash@google.com>
> > F: drivers/net/gve/
> > F: doc/guides/nics/gve.rst
> > F: doc/guides/nics/features/gve.ini
>
> Can you please separate the maintainers' file update into a different
> patch?
Sure, will split this as an extra patch. Thanks!
^ permalink raw reply [flat|nested] 38+ messages in thread
* RE: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
2023-03-28 8:55 ` Ferruh Yigit
@ 2023-03-28 9:06 ` Guo, Junfeng
2023-03-28 9:09 ` Ferruh Yigit
0 siblings, 1 reply; 38+ messages in thread
From: Guo, Junfeng @ 2023-03-28 9:06 UTC (permalink / raw)
To: Ferruh Yigit, Zhang, Qi Z, Wu, Jingjing, Xing, Beilei
Cc: dev, Rushil Gupta, Joshua Washington, Jeroen de Borst
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@amd.com>
> Sent: Tuesday, March 28, 2023 16:55
> To: Guo, Junfeng <junfeng.guo@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Xing,
> Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Rushil Gupta <rushilg@google.com>; Joshua
> Washington <joshwash@google.com>; Jeroen de Borst
> <jeroendb@google.com>
> Subject: Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
>
> On 3/28/2023 3:08 AM, Junfeng Guo wrote:
> > Switch copyright from MIT to BSD-3 for GVE base code.
> > In the meantime, remove MIT license exception for GVE driver.
> > Also update the maintainers for GVE driver.
> >
>
> I guess you are switching 'license' from MIT to BSD-3, not copyright.
> Copyright holder is still Google/Intel etc..
>
> Can you please update patch title & commit log accordingly?
Oh, yes!
This patch just switched the 'license' from MIT to BSD-3, not copyright.
Will update this, thanks!
>
> > Signed-off-by: Rushil Gupta <rushilg@google.com>
> > Signed-off-by: Joshua Washington <joshwash@google.com>
> > Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
> > Signed-off-by: Jeroen de Borst <jeroendb@google.com>
>
> <...>
>
> > diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h
> > index 2dc4507acb..ac0fc1472e 100644
> > --- a/drivers/net/gve/base/gve.h
> > +++ b/drivers/net/gve/base/gve.h
> > @@ -1,6 +1,32 @@
> > -/* SPDX-License-Identifier: MIT
> > - * Google Virtual Ethernet (gve) driver
> > - * Copyright (C) 2015-2022 Google, Inc.
> > +/*
> > + * SPDX-License-Identifier: BSD-3-Clause
> > + *
> > + * Copyright (c) 2022-2023 Google LLC
> > + *
> > + * Redistribution and use in source and binary forms, with or without
> modification,
> > + * are permitted provided that the following conditions are met:
> > + *
> > + * 1. Redistributions of source code must retain the above copyright
> notice, this
> > + * list of conditions and the following disclaimer.
> > + *
> > + * 2. 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.
> > + *
> > + * 3. Neither the name of the copyright holder nor the names of its
> contributors
> > + * may be used to endorse or promote products derived from this
> software without
> > + * specific prior written permission.
> > + *
> > + * 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 HOLDER 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.
> > */
>
> Why not using SPDX tag for new BSD-3 License, but add whole license to
> the files? We have SPDX tag to prevent this.
These are provided by Google team. So I just keep them unchanged here.
So you mean that we only need to keep the license tag part as:
{
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
+ */
}
Right?
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
2023-03-28 9:06 ` Guo, Junfeng
@ 2023-03-28 9:09 ` Ferruh Yigit
2023-03-28 9:35 ` Guo, Junfeng
0 siblings, 1 reply; 38+ messages in thread
From: Ferruh Yigit @ 2023-03-28 9:09 UTC (permalink / raw)
To: Guo, Junfeng, Zhang, Qi Z, Wu, Jingjing, Xing, Beilei
Cc: dev, Rushil Gupta, Joshua Washington, Jeroen de Borst
On 3/28/2023 10:06 AM, Guo, Junfeng wrote:
>
>
>> -----Original Message-----
>> From: Ferruh Yigit <ferruh.yigit@amd.com>
>> Sent: Tuesday, March 28, 2023 16:55
>> To: Guo, Junfeng <junfeng.guo@intel.com>; Zhang, Qi Z
>> <qi.z.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Xing,
>> Beilei <beilei.xing@intel.com>
>> Cc: dev@dpdk.org; Rushil Gupta <rushilg@google.com>; Joshua
>> Washington <joshwash@google.com>; Jeroen de Borst
>> <jeroendb@google.com>
>> Subject: Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
>>
>> On 3/28/2023 3:08 AM, Junfeng Guo wrote:
>>> Switch copyright from MIT to BSD-3 for GVE base code.
>>> In the meantime, remove MIT license exception for GVE driver.
>>> Also update the maintainers for GVE driver.
>>>
>>
>> I guess you are switching 'license' from MIT to BSD-3, not copyright.
>> Copyright holder is still Google/Intel etc..
>>
>> Can you please update patch title & commit log accordingly?
>
> Oh, yes!
> This patch just switched the 'license' from MIT to BSD-3, not copyright.
> Will update this, thanks!
>
>>
>>> Signed-off-by: Rushil Gupta <rushilg@google.com>
>>> Signed-off-by: Joshua Washington <joshwash@google.com>
>>> Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
>>> Signed-off-by: Jeroen de Borst <jeroendb@google.com>
>>
>> <...>
>>
>>> diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h
>>> index 2dc4507acb..ac0fc1472e 100644
>>> --- a/drivers/net/gve/base/gve.h
>>> +++ b/drivers/net/gve/base/gve.h
>>> @@ -1,6 +1,32 @@
>>> -/* SPDX-License-Identifier: MIT
>>> - * Google Virtual Ethernet (gve) driver
>>> - * Copyright (C) 2015-2022 Google, Inc.
>>> +/*
>>> + * SPDX-License-Identifier: BSD-3-Clause
>>> + *
>>> + * Copyright (c) 2022-2023 Google LLC
>>> + *
>>> + * Redistribution and use in source and binary forms, with or without
>> modification,
>>> + * are permitted provided that the following conditions are met:
>>> + *
>>> + * 1. Redistributions of source code must retain the above copyright
>> notice, this
>>> + * list of conditions and the following disclaimer.
>>> + *
>>> + * 2. 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.
>>> + *
>>> + * 3. Neither the name of the copyright holder nor the names of its
>> contributors
>>> + * may be used to endorse or promote products derived from this
>> software without
>>> + * specific prior written permission.
>>> + *
>>> + * 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 HOLDER 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.
>>> */
>>
>> Why not using SPDX tag for new BSD-3 License, but add whole license to
>> the files? We have SPDX tag to prevent this.
>
> These are provided by Google team. So I just keep them unchanged here.
> So you mean that we only need to keep the license tag part as:
> {
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright (c) 2022-2023 Google LLC
> + */
> }
> Right?
Yes please.
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v2 0/3] update license and copyright holders
2023-03-28 2:08 [PATCH 0/2] update license and copyright Junfeng Guo
2023-03-28 2:08 ` [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3 Junfeng Guo
2023-03-28 2:08 ` [PATCH 2/2] net/gve: update copyright holders Junfeng Guo
@ 2023-03-28 9:28 ` Junfeng Guo
2023-03-28 9:28 ` [PATCH v2 1/3] net/gve: switch license from MIT to BSD-3 Junfeng Guo
` (3 more replies)
2 siblings, 4 replies; 38+ messages in thread
From: Junfeng Guo @ 2023-03-28 9:28 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing; +Cc: dev, Junfeng Guo
This patch set contains:
1. switch license from MIT to BSD-3 for GVE base code.
2. remove MIT license exception
3. add maintainers
4. update copyright holders for GVE
v2:
1. correct patch title & commit log
2. separate the maintainers' file update into a different patch
Junfeng Guo (3):
net/gve: switch license from MIT to BSD-3
net/gve: update copyright holders
net/gve: add maintainers for GVE
.mailmap | 1 +
MAINTAINERS | 3 +++
drivers/net/gve/base/gve.h | 5 ++---
drivers/net/gve/base/gve_adminq.c | 5 ++---
drivers/net/gve/base/gve_adminq.h | 6 +++---
drivers/net/gve/base/gve_desc.h | 6 +++---
drivers/net/gve/base/gve_desc_dqo.h | 6 +++---
drivers/net/gve/base/gve_osdep.h | 3 ++-
drivers/net/gve/base/gve_register.h | 6 +++---
drivers/net/gve/gve_ethdev.c | 4 +++-
drivers/net/gve/gve_ethdev.h | 3 ++-
drivers/net/gve/gve_logs.h | 4 +++-
drivers/net/gve/gve_rx.c | 4 +++-
drivers/net/gve/gve_tx.c | 4 +++-
drivers/net/gve/meson.build | 3 ++-
license/exceptions.txt | 1 -
16 files changed, 38 insertions(+), 26 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v2 1/3] net/gve: switch license from MIT to BSD-3
2023-03-28 9:28 ` [PATCH v2 0/3] update license and " Junfeng Guo
@ 2023-03-28 9:28 ` Junfeng Guo
2023-03-28 9:28 ` [PATCH v2 2/3] net/gve: update copyright holders Junfeng Guo
` (2 subsequent siblings)
3 siblings, 0 replies; 38+ messages in thread
From: Junfeng Guo @ 2023-03-28 9:28 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing
Cc: dev, Junfeng Guo, Rushil Gupta, Joshua Washington, Jeroen de Borst
Switch license from MIT to BSD-3 for GVE base code.
In the meantime, remove MIT license exception for GVE driver.
Signed-off-by: Rushil Gupta <rushilg@google.com>
Signed-off-by: Joshua Washington <joshwash@google.com>
Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Signed-off-by: Jeroen de Borst <jeroendb@google.com>
---
.mailmap | 1 +
drivers/net/gve/base/gve.h | 5 ++---
drivers/net/gve/base/gve_adminq.c | 5 ++---
drivers/net/gve/base/gve_adminq.h | 6 +++---
drivers/net/gve/base/gve_desc.h | 6 +++---
drivers/net/gve/base/gve_desc_dqo.h | 6 +++---
drivers/net/gve/base/gve_osdep.h | 3 ++-
drivers/net/gve/base/gve_register.h | 6 +++---
license/exceptions.txt | 1 -
9 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/.mailmap b/.mailmap
index dc30369117..9d66fa727c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -588,6 +588,7 @@ Jens Freimann <jfreimann@redhat.com> <jfreiman@redhat.com>
Jeremy Plsek <jplsek@iol.unh.edu>
Jeremy Spewock <jspewock@iol.unh.edu>
Jerin Jacob <jerinj@marvell.com> <jerin.jacob@caviumnetworks.com> <jerinjacobk@gmail.com>
+Jeroen de Borst <jeroendb@google.com>
Jerome Jutteau <jerome.jutteau@outscale.com>
Jerry Hao OS <jerryhao@os.amperecomputing.com>
Jerry Lilijun <jerry.lilijun@huawei.com>
diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h
index 2dc4507acb..55b7c2688e 100644
--- a/drivers/net/gve/base/gve.h
+++ b/drivers/net/gve/base/gve.h
@@ -1,6 +1,5 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
*/
#ifndef _GVE_H_
diff --git a/drivers/net/gve/base/gve_adminq.c b/drivers/net/gve/base/gve_adminq.c
index e745b709b2..3519a2217f 100644
--- a/drivers/net/gve/base/gve_adminq.c
+++ b/drivers/net/gve/base/gve_adminq.c
@@ -1,6 +1,5 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
*/
#include "../gve_ethdev.h"
diff --git a/drivers/net/gve/base/gve_adminq.h b/drivers/net/gve/base/gve_adminq.h
index 05550119de..76862a148e 100644
--- a/drivers/net/gve/base/gve_adminq.h
+++ b/drivers/net/gve/base/gve_adminq.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
+
*/
#ifndef _GVE_ADMINQ_H
diff --git a/drivers/net/gve/base/gve_desc.h b/drivers/net/gve/base/gve_desc.h
index 006b36442f..0df97eacaf 100644
--- a/drivers/net/gve/base/gve_desc.h
+++ b/drivers/net/gve/base/gve_desc.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
+
*/
/* GVE Transmit Descriptor formats */
diff --git a/drivers/net/gve/base/gve_desc_dqo.h b/drivers/net/gve/base/gve_desc_dqo.h
index ee1afdecb8..fef9c21da9 100644
--- a/drivers/net/gve/base/gve_desc_dqo.h
+++ b/drivers/net/gve/base/gve_desc_dqo.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
+
*/
/* GVE DQO Descriptor formats */
diff --git a/drivers/net/gve/base/gve_osdep.h b/drivers/net/gve/base/gve_osdep.h
index 7cb73002f4..92efe3c594 100644
--- a/drivers/net/gve/base/gve_osdep.h
+++ b/drivers/net/gve/base/gve_osdep.h
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+
*/
#ifndef _GVE_OSDEP_H_
diff --git a/drivers/net/gve/base/gve_register.h b/drivers/net/gve/base/gve_register.h
index c674167f31..3ee4e65815 100644
--- a/drivers/net/gve/base/gve_register.h
+++ b/drivers/net/gve/base/gve_register.h
@@ -1,6 +1,6 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
+
*/
#ifndef _GVE_REGISTER_H_
diff --git a/license/exceptions.txt b/license/exceptions.txt
index 1ded290eee..1bd4dbf8f7 100644
--- a/license/exceptions.txt
+++ b/license/exceptions.txt
@@ -16,5 +16,4 @@ SPDX Identifier TB Approval Date GB Approval Date File name
2.BSD-2-Clause 10/23/2019 12/18/2019 lib/eal/windows/include/getopt.h
3.ISC AND
BSD-2-Clause 10/23/2019 12/18/2019 lib/eal/windows/getopt.c
-4. MIT 10/19/2022 10/18/2022 drivers/net/gve/base/*
---------------------------------------------------------------------------------------------------
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v2 2/3] net/gve: update copyright holders
2023-03-28 9:28 ` [PATCH v2 0/3] update license and " Junfeng Guo
2023-03-28 9:28 ` [PATCH v2 1/3] net/gve: switch license from MIT to BSD-3 Junfeng Guo
@ 2023-03-28 9:28 ` Junfeng Guo
2023-03-28 9:28 ` [PATCH v2 3/3] net/gve: add maintainers for GVE Junfeng Guo
2023-03-28 9:45 ` [PATCH v3 0/3] update license and copyright holders Junfeng Guo
3 siblings, 0 replies; 38+ messages in thread
From: Junfeng Guo @ 2023-03-28 9:28 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing
Cc: dev, Junfeng Guo, Rushil Gupta, Joshua Washington, Jeroen de Borst
Add Google LLC as one of the copyright holders for GVE.
Signed-off-by: Rushil Gupta <rushilg@google.com>
Signed-off-by: Joshua Washington <joshwash@google.com>
Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Signed-off-by: Jeroen de Borst <jeroendb@google.com>
---
drivers/net/gve/gve_ethdev.c | 4 +++-
drivers/net/gve/gve_ethdev.h | 3 ++-
drivers/net/gve/gve_logs.h | 4 +++-
drivers/net/gve/gve_rx.c | 4 +++-
drivers/net/gve/gve_tx.c | 4 +++-
drivers/net/gve/meson.build | 3 ++-
6 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c
index cf28a4a3b7..65b634e04f 100644
--- a/drivers/net/gve/gve_ethdev.c
+++ b/drivers/net/gve/gve_ethdev.c
@@ -1,5 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
+
*/
#include "gve_ethdev.h"
diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h
index 42a02cf5d4..64d5bb0f78 100644
--- a/drivers/net/gve/gve_ethdev.h
+++ b/drivers/net/gve/gve_ethdev.h
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
*/
#ifndef _GVE_ETHDEV_H_
diff --git a/drivers/net/gve/gve_logs.h b/drivers/net/gve/gve_logs.h
index 0d02da46e1..fd89cd550e 100644
--- a/drivers/net/gve/gve_logs.h
+++ b/drivers/net/gve/gve_logs.h
@@ -1,5 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
+
*/
#ifndef _GVE_LOGS_H_
diff --git a/drivers/net/gve/gve_rx.c b/drivers/net/gve/gve_rx.c
index 8d8f94efff..0475d00a20 100644
--- a/drivers/net/gve/gve_rx.c
+++ b/drivers/net/gve/gve_rx.c
@@ -1,5 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
+
*/
#include "gve_ethdev.h"
diff --git a/drivers/net/gve/gve_tx.c b/drivers/net/gve/gve_tx.c
index fee3b939c7..b35bad56a6 100644
--- a/drivers/net/gve/gve_tx.c
+++ b/drivers/net/gve/gve_tx.c
@@ -1,5 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
+
*/
#include "gve_ethdev.h"
diff --git a/drivers/net/gve/meson.build b/drivers/net/gve/meson.build
index af0010c01c..9cacccf2aa 100644
--- a/drivers/net/gve/meson.build
+++ b/drivers/net/gve/meson.build
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2022 Intel Corporation
+# Copyright (c) 2022-2023 Google LLC
+# Copyright (c) 2022-2023 Intel Corporation
if is_windows
build = false
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v2 3/3] net/gve: add maintainers for GVE
2023-03-28 9:28 ` [PATCH v2 0/3] update license and " Junfeng Guo
2023-03-28 9:28 ` [PATCH v2 1/3] net/gve: switch license from MIT to BSD-3 Junfeng Guo
2023-03-28 9:28 ` [PATCH v2 2/3] net/gve: update copyright holders Junfeng Guo
@ 2023-03-28 9:28 ` Junfeng Guo
2023-03-28 9:45 ` [PATCH v3 0/3] update license and copyright holders Junfeng Guo
3 siblings, 0 replies; 38+ messages in thread
From: Junfeng Guo @ 2023-03-28 9:28 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing; +Cc: dev, Junfeng Guo
Add maintainers from Google for GVE.
Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
---
MAINTAINERS | 3 +++
1 file changed, 3 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 1a33ad8592..988c7aecfa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini
Google Virtual Ethernet
M: Junfeng Guo <junfeng.guo@intel.com>
+M: Jeroen de Borst <jeroendb@google.com>
+M: Rushil Gupta <rushilg@google.com>
+M: Joshua Washington <joshwash@google.com>
F: drivers/net/gve/
F: doc/guides/nics/gve.rst
F: doc/guides/nics/features/gve.ini
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* RE: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
2023-03-28 9:09 ` Ferruh Yigit
@ 2023-03-28 9:35 ` Guo, Junfeng
0 siblings, 0 replies; 38+ messages in thread
From: Guo, Junfeng @ 2023-03-28 9:35 UTC (permalink / raw)
To: Ferruh Yigit, Zhang, Qi Z, Wu, Jingjing, Xing, Beilei
Cc: dev, Rushil Gupta, Joshua Washington, Jeroen de Borst
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@amd.com>
> Sent: Tuesday, March 28, 2023 17:09
> To: Guo, Junfeng <junfeng.guo@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Xing,
> Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Rushil Gupta <rushilg@google.com>; Joshua
> Washington <joshwash@google.com>; Jeroen de Borst
> <jeroendb@google.com>
> Subject: Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
>
> On 3/28/2023 10:06 AM, Guo, Junfeng wrote:
> >
> >
> >> -----Original Message-----
> >> From: Ferruh Yigit <ferruh.yigit@amd.com>
> >> Sent: Tuesday, March 28, 2023 16:55
> >> To: Guo, Junfeng <junfeng.guo@intel.com>; Zhang, Qi Z
> >> <qi.z.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Xing,
> >> Beilei <beilei.xing@intel.com>
> >> Cc: dev@dpdk.org; Rushil Gupta <rushilg@google.com>; Joshua
> >> Washington <joshwash@google.com>; Jeroen de Borst
> >> <jeroendb@google.com>
> >> Subject: Re: [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3
> >>
> >> On 3/28/2023 3:08 AM, Junfeng Guo wrote:
> >>> Switch copyright from MIT to BSD-3 for GVE base code.
> >>> In the meantime, remove MIT license exception for GVE driver.
> >>> Also update the maintainers for GVE driver.
> >>>
> >>
> >> I guess you are switching 'license' from MIT to BSD-3, not copyright.
> >> Copyright holder is still Google/Intel etc..
> >>
> >> Can you please update patch title & commit log accordingly?
> >
> > Oh, yes!
> > This patch just switched the 'license' from MIT to BSD-3, not copyright.
> > Will update this, thanks!
> >
> >>
> >>> Signed-off-by: Rushil Gupta <rushilg@google.com>
> >>> Signed-off-by: Joshua Washington <joshwash@google.com>
> >>> Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
> >>> Signed-off-by: Jeroen de Borst <jeroendb@google.com>
> >>
> >> <...>
> >>
> >>> diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h
> >>> index 2dc4507acb..ac0fc1472e 100644
> >>> --- a/drivers/net/gve/base/gve.h
> >>> +++ b/drivers/net/gve/base/gve.h
> >>> @@ -1,6 +1,32 @@
> >>> -/* SPDX-License-Identifier: MIT
> >>> - * Google Virtual Ethernet (gve) driver
> >>> - * Copyright (C) 2015-2022 Google, Inc.
> >>> +/*
> >>> + * SPDX-License-Identifier: BSD-3-Clause
> >>> + *
> >>> + * Copyright (c) 2022-2023 Google LLC
> >>> + *
> >>> + * Redistribution and use in source and binary forms, with or without
> >> modification,
> >>> + * are permitted provided that the following conditions are met:
> >>> + *
> >>> + * 1. Redistributions of source code must retain the above copyright
> >> notice, this
> >>> + * list of conditions and the following disclaimer.
> >>> + *
> >>> + * 2. 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.
> >>> + *
> >>> + * 3. Neither the name of the copyright holder nor the names of its
> >> contributors
> >>> + * may be used to endorse or promote products derived from this
> >> software without
> >>> + * specific prior written permission.
> >>> + *
> >>> + * 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 HOLDER 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.
> >>> */
> >>
> >> Why not using SPDX tag for new BSD-3 License, but add whole license
> to
> >> the files? We have SPDX tag to prevent this.
> >
> > These are provided by Google team. So I just keep them unchanged here.
> > So you mean that we only need to keep the license tag part as:
> > {
> > +/* SPDX-License-Identifier: BSD-3-Clause
> > + * Copyright (c) 2022-2023 Google LLC
> > + */
> > }
> > Right?
>
> Yes please.
Sure, thanks!
^ permalink raw reply [flat|nested] 38+ messages in thread
* RE: [PATCH 2/2] net/gve: update copyright holders
2023-03-28 8:56 ` Ferruh Yigit
@ 2023-03-28 9:35 ` Guo, Junfeng
2023-03-28 10:10 ` Ferruh Yigit
2023-03-29 14:07 ` Thomas Monjalon
0 siblings, 2 replies; 38+ messages in thread
From: Guo, Junfeng @ 2023-03-28 9:35 UTC (permalink / raw)
To: Ferruh Yigit, Zhang, Qi Z, Wu, Jingjing, Xing, Beilei
Cc: dev, Rushil Gupta, Joshua Washington, Jeroen de Borst
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@amd.com>
> Sent: Tuesday, March 28, 2023 16:57
> To: Guo, Junfeng <junfeng.guo@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Xing,
> Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Rushil Gupta <rushilg@google.com>; Joshua
> Washington <joshwash@google.com>; Jeroen de Borst
> <jeroendb@google.com>
> Subject: Re: [PATCH 2/2] net/gve: update copyright holders
>
> On 3/28/2023 3:08 AM, Junfeng Guo wrote:
> > Add Google LLC as one of the copyright holders for GVE.
> >
> > Signed-off-by: Rushil Gupta <rushilg@google.com>
> > Signed-off-by: Joshua Washington <joshwash@google.com>
> > Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
> > Signed-off-by: Jeroen de Borst <jeroendb@google.com>
> > ---
> > drivers/net/gve/gve_ethdev.c | 32
> ++++++++++++++++++++++++++++++--
> > drivers/net/gve/gve_ethdev.h | 32
> ++++++++++++++++++++++++++++++--
> > drivers/net/gve/gve_logs.h | 32 ++++++++++++++++++++++++++++++-
> -
> > drivers/net/gve/gve_rx.c | 32 ++++++++++++++++++++++++++++++--
> > drivers/net/gve/gve_tx.c | 32 ++++++++++++++++++++++++++++++--
> > drivers/net/gve/meson.build | 31
> ++++++++++++++++++++++++++++++-
> > 6 files changed, 180 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/net/gve/gve_ethdev.c
> b/drivers/net/gve/gve_ethdev.c
> > index cf28a4a3b7..1b8f0fde8f 100644
> > --- a/drivers/net/gve/gve_ethdev.c
> > +++ b/drivers/net/gve/gve_ethdev.c
> > @@ -1,5 +1,33 @@
> > -/* SPDX-License-Identifier: BSD-3-Clause
> > - * Copyright(C) 2022 Intel Corporation
> > +/*
> > + * SPDX-License-Identifier: BSD-3-Clause
> > + *
> > + * Copyright (c) 2022-2023 Google LLC
> > + * Copyright (c) 2022-2023 Intel Corporation
> > + *
> > + * Redistribution and use in source and binary forms, with or without
> modification,
> > + * are permitted provided that the following conditions are met:
> > + *
> > + * 1. Redistributions of source code must retain the above copyright
> notice, this
> > + * list of conditions and the following disclaimer.
> > + *
> > + * 2. 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.
> > + *
> > + * 3. Neither the name of the copyright holder nor the names of its
> contributors
> > + * may be used to endorse or promote products derived from this
> software without
> > + * specific prior written permission.
> > + *
> > + * 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 HOLDER 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.
> > */
>
> Can you please separate the patches that updates license and copyright?
Sure.
The background is that, in the past (DPDK 22.11) we didn't get the approval
of license from Google, thus chose the MIT License for the base code, and
BSD-3 License for GVE common code (without the files in /base folder).
We also left the copyright holder of base code just to Google Inc, and made
Intel as the copyright holder of GVE common code (without /base folder).
Today we are working together for GVE dev and maintaining. And we got
the approval of BSD-3 License from Google for the base code.
Thus we dicided to 1) switch the License of GVE base code from MIT to BSD-3;
2) add Google LLC as one of the copyright holders for GVE common code.
Thanks!
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v3 0/3] update license and copyright holders
2023-03-28 9:28 ` [PATCH v2 0/3] update license and " Junfeng Guo
` (2 preceding siblings ...)
2023-03-28 9:28 ` [PATCH v2 3/3] net/gve: add maintainers for GVE Junfeng Guo
@ 2023-03-28 9:45 ` Junfeng Guo
2023-03-28 9:45 ` [PATCH v3 1/3] net/gve: switch license from MIT to BSD-3 Junfeng Guo
` (3 more replies)
3 siblings, 4 replies; 38+ messages in thread
From: Junfeng Guo @ 2023-03-28 9:45 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing; +Cc: dev, Junfeng Guo
This patch set contains:
1. switch license from MIT to BSD-3 for GVE base code.
2. remove MIT license exception
3. add maintainers
4. update copyright holders for GVE
v3:
1. remove redundant blank line
v2:
1. correct patch title & commit log
2. separate the maintainers' file update into a different patch
Junfeng Guo (3):
net/gve: switch license from MIT to BSD-3
net/gve: update copyright holders
net/gve: add maintainers for GVE
.mailmap | 1 +
MAINTAINERS | 3 +++
drivers/net/gve/base/gve.h | 5 ++---
drivers/net/gve/base/gve_adminq.c | 5 ++---
drivers/net/gve/base/gve_adminq.h | 5 ++---
drivers/net/gve/base/gve_desc.h | 5 ++---
drivers/net/gve/base/gve_desc_dqo.h | 5 ++---
drivers/net/gve/base/gve_osdep.h | 2 +-
drivers/net/gve/base/gve_register.h | 5 ++---
drivers/net/gve/gve_ethdev.c | 3 ++-
drivers/net/gve/gve_ethdev.h | 3 ++-
drivers/net/gve/gve_logs.h | 3 ++-
drivers/net/gve/gve_rx.c | 3 ++-
drivers/net/gve/gve_tx.c | 3 ++-
drivers/net/gve/meson.build | 3 ++-
license/exceptions.txt | 1 -
16 files changed, 29 insertions(+), 26 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v3 1/3] net/gve: switch license from MIT to BSD-3
2023-03-28 9:45 ` [PATCH v3 0/3] update license and copyright holders Junfeng Guo
@ 2023-03-28 9:45 ` Junfeng Guo
2023-03-28 10:36 ` Ferruh Yigit
2023-03-28 9:45 ` [PATCH v3 2/3] net/gve: update copyright holders Junfeng Guo
` (2 subsequent siblings)
3 siblings, 1 reply; 38+ messages in thread
From: Junfeng Guo @ 2023-03-28 9:45 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing
Cc: dev, Junfeng Guo, Rushil Gupta, Joshua Washington, Jeroen de Borst
Switch license from MIT to BSD-3 for GVE base code.
In the meantime, remove MIT license exception for GVE driver.
Signed-off-by: Rushil Gupta <rushilg@google.com>
Signed-off-by: Joshua Washington <joshwash@google.com>
Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Signed-off-by: Jeroen de Borst <jeroendb@google.com>
---
.mailmap | 1 +
drivers/net/gve/base/gve.h | 5 ++---
drivers/net/gve/base/gve_adminq.c | 5 ++---
drivers/net/gve/base/gve_adminq.h | 5 ++---
drivers/net/gve/base/gve_desc.h | 5 ++---
drivers/net/gve/base/gve_desc_dqo.h | 5 ++---
drivers/net/gve/base/gve_osdep.h | 2 +-
drivers/net/gve/base/gve_register.h | 5 ++---
license/exceptions.txt | 1 -
9 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/.mailmap b/.mailmap
index dc30369117..9d66fa727c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -588,6 +588,7 @@ Jens Freimann <jfreimann@redhat.com> <jfreiman@redhat.com>
Jeremy Plsek <jplsek@iol.unh.edu>
Jeremy Spewock <jspewock@iol.unh.edu>
Jerin Jacob <jerinj@marvell.com> <jerin.jacob@caviumnetworks.com> <jerinjacobk@gmail.com>
+Jeroen de Borst <jeroendb@google.com>
Jerome Jutteau <jerome.jutteau@outscale.com>
Jerry Hao OS <jerryhao@os.amperecomputing.com>
Jerry Lilijun <jerry.lilijun@huawei.com>
diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h
index 2dc4507acb..55b7c2688e 100644
--- a/drivers/net/gve/base/gve.h
+++ b/drivers/net/gve/base/gve.h
@@ -1,6 +1,5 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
*/
#ifndef _GVE_H_
diff --git a/drivers/net/gve/base/gve_adminq.c b/drivers/net/gve/base/gve_adminq.c
index e745b709b2..3519a2217f 100644
--- a/drivers/net/gve/base/gve_adminq.c
+++ b/drivers/net/gve/base/gve_adminq.c
@@ -1,6 +1,5 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
*/
#include "../gve_ethdev.h"
diff --git a/drivers/net/gve/base/gve_adminq.h b/drivers/net/gve/base/gve_adminq.h
index 05550119de..e6907fc16f 100644
--- a/drivers/net/gve/base/gve_adminq.h
+++ b/drivers/net/gve/base/gve_adminq.h
@@ -1,6 +1,5 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
*/
#ifndef _GVE_ADMINQ_H
diff --git a/drivers/net/gve/base/gve_desc.h b/drivers/net/gve/base/gve_desc.h
index 006b36442f..c62563f754 100644
--- a/drivers/net/gve/base/gve_desc.h
+++ b/drivers/net/gve/base/gve_desc.h
@@ -1,6 +1,5 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
*/
/* GVE Transmit Descriptor formats */
diff --git a/drivers/net/gve/base/gve_desc_dqo.h b/drivers/net/gve/base/gve_desc_dqo.h
index ee1afdecb8..d0887778d3 100644
--- a/drivers/net/gve/base/gve_desc_dqo.h
+++ b/drivers/net/gve/base/gve_desc_dqo.h
@@ -1,6 +1,5 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
*/
/* GVE DQO Descriptor formats */
diff --git a/drivers/net/gve/base/gve_osdep.h b/drivers/net/gve/base/gve_osdep.h
index 7cb73002f4..f7d87fec16 100644
--- a/drivers/net/gve/base/gve_osdep.h
+++ b/drivers/net/gve/base/gve_osdep.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
*/
#ifndef _GVE_OSDEP_H_
diff --git a/drivers/net/gve/base/gve_register.h b/drivers/net/gve/base/gve_register.h
index c674167f31..615ceffc88 100644
--- a/drivers/net/gve/base/gve_register.h
+++ b/drivers/net/gve/base/gve_register.h
@@ -1,6 +1,5 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
*/
#ifndef _GVE_REGISTER_H_
diff --git a/license/exceptions.txt b/license/exceptions.txt
index 1ded290eee..1bd4dbf8f7 100644
--- a/license/exceptions.txt
+++ b/license/exceptions.txt
@@ -16,5 +16,4 @@ SPDX Identifier TB Approval Date GB Approval Date File name
2.BSD-2-Clause 10/23/2019 12/18/2019 lib/eal/windows/include/getopt.h
3.ISC AND
BSD-2-Clause 10/23/2019 12/18/2019 lib/eal/windows/getopt.c
-4. MIT 10/19/2022 10/18/2022 drivers/net/gve/base/*
---------------------------------------------------------------------------------------------------
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v3 2/3] net/gve: update copyright holders
2023-03-28 9:45 ` [PATCH v3 0/3] update license and copyright holders Junfeng Guo
2023-03-28 9:45 ` [PATCH v3 1/3] net/gve: switch license from MIT to BSD-3 Junfeng Guo
@ 2023-03-28 9:45 ` Junfeng Guo
2023-03-28 10:37 ` Ferruh Yigit
2023-03-28 9:45 ` [PATCH v3 3/3] net/gve: add maintainers for GVE Junfeng Guo
2023-03-29 2:26 ` [PATCH v4 0/3] update license and copyright holders Junfeng Guo
3 siblings, 1 reply; 38+ messages in thread
From: Junfeng Guo @ 2023-03-28 9:45 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing
Cc: dev, Junfeng Guo, Rushil Gupta, Joshua Washington, Jeroen de Borst
Add Google LLC as one of the copyright holders for GVE.
Signed-off-by: Rushil Gupta <rushilg@google.com>
Signed-off-by: Joshua Washington <joshwash@google.com>
Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Signed-off-by: Jeroen de Borst <jeroendb@google.com>
---
drivers/net/gve/gve_ethdev.c | 3 ++-
drivers/net/gve/gve_ethdev.h | 3 ++-
drivers/net/gve/gve_logs.h | 3 ++-
drivers/net/gve/gve_rx.c | 3 ++-
drivers/net/gve/gve_tx.c | 3 ++-
drivers/net/gve/meson.build | 3 ++-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c
index cf28a4a3b7..e1998cc864 100644
--- a/drivers/net/gve/gve_ethdev.c
+++ b/drivers/net/gve/gve_ethdev.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
*/
#include "gve_ethdev.h"
diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h
index 42a02cf5d4..64d5bb0f78 100644
--- a/drivers/net/gve/gve_ethdev.h
+++ b/drivers/net/gve/gve_ethdev.h
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
*/
#ifndef _GVE_ETHDEV_H_
diff --git a/drivers/net/gve/gve_logs.h b/drivers/net/gve/gve_logs.h
index 0d02da46e1..997a508f22 100644
--- a/drivers/net/gve/gve_logs.h
+++ b/drivers/net/gve/gve_logs.h
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
*/
#ifndef _GVE_LOGS_H_
diff --git a/drivers/net/gve/gve_rx.c b/drivers/net/gve/gve_rx.c
index 8d8f94efff..e8d5a8723b 100644
--- a/drivers/net/gve/gve_rx.c
+++ b/drivers/net/gve/gve_rx.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
*/
#include "gve_ethdev.h"
diff --git a/drivers/net/gve/gve_tx.c b/drivers/net/gve/gve_tx.c
index fee3b939c7..bbb954c9ea 100644
--- a/drivers/net/gve/gve_tx.c
+++ b/drivers/net/gve/gve_tx.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
*/
#include "gve_ethdev.h"
diff --git a/drivers/net/gve/meson.build b/drivers/net/gve/meson.build
index af0010c01c..9cacccf2aa 100644
--- a/drivers/net/gve/meson.build
+++ b/drivers/net/gve/meson.build
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2022 Intel Corporation
+# Copyright (c) 2022-2023 Google LLC
+# Copyright (c) 2022-2023 Intel Corporation
if is_windows
build = false
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v3 3/3] net/gve: add maintainers for GVE
2023-03-28 9:45 ` [PATCH v3 0/3] update license and copyright holders Junfeng Guo
2023-03-28 9:45 ` [PATCH v3 1/3] net/gve: switch license from MIT to BSD-3 Junfeng Guo
2023-03-28 9:45 ` [PATCH v3 2/3] net/gve: update copyright holders Junfeng Guo
@ 2023-03-28 9:45 ` Junfeng Guo
2023-03-28 10:00 ` Guo, Junfeng
2023-03-29 2:26 ` [PATCH v4 0/3] update license and copyright holders Junfeng Guo
3 siblings, 1 reply; 38+ messages in thread
From: Junfeng Guo @ 2023-03-28 9:45 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing; +Cc: dev, Junfeng Guo
Add maintainers from Google for GVE.
Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
---
MAINTAINERS | 3 +++
1 file changed, 3 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 1a33ad8592..988c7aecfa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini
Google Virtual Ethernet
M: Junfeng Guo <junfeng.guo@intel.com>
+M: Jeroen de Borst <jeroendb@google.com>
+M: Rushil Gupta <rushilg@google.com>
+M: Joshua Washington <joshwash@google.com>
F: drivers/net/gve/
F: doc/guides/nics/gve.rst
F: doc/guides/nics/features/gve.ini
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* RE: [PATCH v3 3/3] net/gve: add maintainers for GVE
2023-03-28 9:45 ` [PATCH v3 3/3] net/gve: add maintainers for GVE Junfeng Guo
@ 2023-03-28 10:00 ` Guo, Junfeng
2023-03-28 10:34 ` Ferruh Yigit
0 siblings, 1 reply; 38+ messages in thread
From: Guo, Junfeng @ 2023-03-28 10:00 UTC (permalink / raw)
To: Zhang, Qi Z, Wu, Jingjing, ferruh.yigit, Xing, Beilei, rushilg; +Cc: dev
+ Rushil Gupta <rushilg@google.com>
> -----Original Message-----
> From: Guo, Junfeng <junfeng.guo@intel.com>
> Sent: Tuesday, March 28, 2023 17:45
> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Wu, Jingjing
> <jingjing.wu@intel.com>; ferruh.yigit@amd.com; Xing, Beilei
> <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Guo, Junfeng <junfeng.guo@intel.com>
> Subject: [PATCH v3 3/3] net/gve: add maintainers for GVE
>
> Add maintainers from Google for GVE.
>
> Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
> ---
> MAINTAINERS | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 1a33ad8592..988c7aecfa 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini
>
> Google Virtual Ethernet
> M: Junfeng Guo <junfeng.guo@intel.com>
> +M: Jeroen de Borst <jeroendb@google.com>
> +M: Rushil Gupta <rushilg@google.com>
> +M: Joshua Washington <joshwash@google.com>
> F: drivers/net/gve/
> F: doc/guides/nics/gve.rst
> F: doc/guides/nics/features/gve.ini
> --
> 2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 2/2] net/gve: update copyright holders
2023-03-28 9:35 ` Guo, Junfeng
@ 2023-03-28 10:10 ` Ferruh Yigit
2023-03-29 14:07 ` Thomas Monjalon
1 sibling, 0 replies; 38+ messages in thread
From: Ferruh Yigit @ 2023-03-28 10:10 UTC (permalink / raw)
To: Guo, Junfeng, Zhang, Qi Z, Wu, Jingjing, Xing, Beilei
Cc: dev, Rushil Gupta, Joshua Washington, Jeroen de Borst
On 3/28/2023 10:35 AM, Guo, Junfeng wrote:
>
>
>> -----Original Message-----
>> From: Ferruh Yigit <ferruh.yigit@amd.com>
>> Sent: Tuesday, March 28, 2023 16:57
>> To: Guo, Junfeng <junfeng.guo@intel.com>; Zhang, Qi Z
>> <qi.z.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Xing,
>> Beilei <beilei.xing@intel.com>
>> Cc: dev@dpdk.org; Rushil Gupta <rushilg@google.com>; Joshua
>> Washington <joshwash@google.com>; Jeroen de Borst
>> <jeroendb@google.com>
>> Subject: Re: [PATCH 2/2] net/gve: update copyright holders
>>
>> On 3/28/2023 3:08 AM, Junfeng Guo wrote:
>>> Add Google LLC as one of the copyright holders for GVE.
>>>
>>> Signed-off-by: Rushil Gupta <rushilg@google.com>
>>> Signed-off-by: Joshua Washington <joshwash@google.com>
>>> Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
>>> Signed-off-by: Jeroen de Borst <jeroendb@google.com>
>>> ---
>>> drivers/net/gve/gve_ethdev.c | 32
>> ++++++++++++++++++++++++++++++--
>>> drivers/net/gve/gve_ethdev.h | 32
>> ++++++++++++++++++++++++++++++--
>>> drivers/net/gve/gve_logs.h | 32 ++++++++++++++++++++++++++++++-
>> -
>>> drivers/net/gve/gve_rx.c | 32 ++++++++++++++++++++++++++++++--
>>> drivers/net/gve/gve_tx.c | 32 ++++++++++++++++++++++++++++++--
>>> drivers/net/gve/meson.build | 31
>> ++++++++++++++++++++++++++++++-
>>> 6 files changed, 180 insertions(+), 11 deletions(-)
>>>
>>> diff --git a/drivers/net/gve/gve_ethdev.c
>> b/drivers/net/gve/gve_ethdev.c
>>> index cf28a4a3b7..1b8f0fde8f 100644
>>> --- a/drivers/net/gve/gve_ethdev.c
>>> +++ b/drivers/net/gve/gve_ethdev.c
>>> @@ -1,5 +1,33 @@
>>> -/* SPDX-License-Identifier: BSD-3-Clause
>>> - * Copyright(C) 2022 Intel Corporation
>>> +/*
>>> + * SPDX-License-Identifier: BSD-3-Clause
>>> + *
>>> + * Copyright (c) 2022-2023 Google LLC
>>> + * Copyright (c) 2022-2023 Intel Corporation
>>> + *
>>> + * Redistribution and use in source and binary forms, with or without
>> modification,
>>> + * are permitted provided that the following conditions are met:
>>> + *
>>> + * 1. Redistributions of source code must retain the above copyright
>> notice, this
>>> + * list of conditions and the following disclaimer.
>>> + *
>>> + * 2. 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.
>>> + *
>>> + * 3. Neither the name of the copyright holder nor the names of its
>> contributors
>>> + * may be used to endorse or promote products derived from this
>> software without
>>> + * specific prior written permission.
>>> + *
>>> + * 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 HOLDER 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.
>>> */
>>
>> Can you please separate the patches that updates license and copyright?
>
> Sure.
>
> The background is that, in the past (DPDK 22.11) we didn't get the approval
> of license from Google, thus chose the MIT License for the base code, and
> BSD-3 License for GVE common code (without the files in /base folder).
> We also left the copyright holder of base code just to Google Inc, and made
> Intel as the copyright holder of GVE common code (without /base folder).
>
> Today we are working together for GVE dev and maintaining. And we got
> the approval of BSD-3 License from Google for the base code.
> Thus we dicided to 1) switch the License of GVE base code from MIT to BSD-3;
> 2) add Google LLC as one of the copyright holders for GVE common code.
>
+1 to switch the DPDK common BSD-3 license, instead of having an
exception for the driver, it simplifies things.
Thank you for following this up.
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 3/3] net/gve: add maintainers for GVE
2023-03-28 10:00 ` Guo, Junfeng
@ 2023-03-28 10:34 ` Ferruh Yigit
2023-03-29 2:54 ` Guo, Junfeng
0 siblings, 1 reply; 38+ messages in thread
From: Ferruh Yigit @ 2023-03-28 10:34 UTC (permalink / raw)
To: Guo, Junfeng, Zhang, Qi Z, Wu, Jingjing, Xing, Beilei, rushilg
Cc: dev, Jeroen de Borst, Rushil Gupta, Joshua Washington, Thomas Monjalon
On 3/28/2023 11:00 AM, Guo, Junfeng wrote:
> + Rushil Gupta <rushilg@google.com>
>
>> -----Original Message-----
>> From: Guo, Junfeng <junfeng.guo@intel.com>
>> Sent: Tuesday, March 28, 2023 17:45
>> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Wu, Jingjing
>> <jingjing.wu@intel.com>; ferruh.yigit@amd.com; Xing, Beilei
>> <beilei.xing@intel.com>
>> Cc: dev@dpdk.org; Guo, Junfeng <junfeng.guo@intel.com>
>> Subject: [PATCH v3 3/3] net/gve: add maintainers for GVE
>>
>> Add maintainers from Google for GVE.
>>
>> Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
>> ---
>> MAINTAINERS | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index 1a33ad8592..988c7aecfa 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini
>>
>> Google Virtual Ethernet
>> M: Junfeng Guo <junfeng.guo@intel.com>
>> +M: Jeroen de Borst <jeroendb@google.com>
>> +M: Rushil Gupta <rushilg@google.com>
>> +M: Joshua Washington <joshwash@google.com>
>> F: drivers/net/gve/
>> F: doc/guides/nics/gve.rst
>> F: doc/guides/nics/features/gve.ini
New maintainers were not part of the upstreaming process, so we don't
know much about the engagement and commitment level of them.
However, as far as I understand they are the base code owners, which
means we can trust their technical expertise that is why good to have
them on board.
Primarily for due diligence, would it be OK to get explicit Ack from the
new maintainers, to confirm they are aware of and agree to the
responsibilities they are accepting?
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 1/3] net/gve: switch license from MIT to BSD-3
2023-03-28 9:45 ` [PATCH v3 1/3] net/gve: switch license from MIT to BSD-3 Junfeng Guo
@ 2023-03-28 10:36 ` Ferruh Yigit
2023-03-29 2:35 ` Guo, Junfeng
0 siblings, 1 reply; 38+ messages in thread
From: Ferruh Yigit @ 2023-03-28 10:36 UTC (permalink / raw)
To: Junfeng Guo, qi.z.zhang, jingjing.wu, beilei.xing
Cc: dev, Rushil Gupta, Joshua Washington, Jeroen de Borst
On 3/28/2023 10:45 AM, Junfeng Guo wrote:
> diff --git a/drivers/net/gve/base/gve_osdep.h b/drivers/net/gve/base/gve_osdep.h
> index 7cb73002f4..f7d87fec16 100644
> --- a/drivers/net/gve/base/gve_osdep.h
> +++ b/drivers/net/gve/base/gve_osdep.h
> @@ -1,5 +1,5 @@
> /* SPDX-License-Identifier: BSD-3-Clause
> - * Copyright(C) 2022 Intel Corporation
> + * Copyright (c) 2022-2023 Google LLC
> */
Is this intentional to move Copyright from Intel to Google?
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 2/3] net/gve: update copyright holders
2023-03-28 9:45 ` [PATCH v3 2/3] net/gve: update copyright holders Junfeng Guo
@ 2023-03-28 10:37 ` Ferruh Yigit
2023-03-28 22:11 ` Rushil Gupta
0 siblings, 1 reply; 38+ messages in thread
From: Ferruh Yigit @ 2023-03-28 10:37 UTC (permalink / raw)
To: Junfeng Guo, qi.z.zhang, jingjing.wu, beilei.xing
Cc: dev, Rushil Gupta, Joshua Washington, Jeroen de Borst
On 3/28/2023 10:45 AM, Junfeng Guo wrote:
> Add Google LLC as one of the copyright holders for GVE.
>
> Signed-off-by: Rushil Gupta <rushilg@google.com>
> Signed-off-by: Joshua Washington <joshwash@google.com>
> Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
> Signed-off-by: Jeroen de Borst <jeroendb@google.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v3 2/3] net/gve: update copyright holders
2023-03-28 10:37 ` Ferruh Yigit
@ 2023-03-28 22:11 ` Rushil Gupta
0 siblings, 0 replies; 38+ messages in thread
From: Rushil Gupta @ 2023-03-28 22:11 UTC (permalink / raw)
To: Ferruh Yigit
Cc: Junfeng Guo, qi.z.zhang, jingjing.wu, beilei.xing, dev,
Joshua Washington, Jeroen de Borst
[-- Attachment #1: Type: text/plain, Size: 521 bytes --]
On Tue, Mar 28, 2023 at 3:37 AM Ferruh Yigit <ferruh.yigit@amd.com> wrote:
> On 3/28/2023 10:45 AM, Junfeng Guo wrote:
> > Add Google LLC as one of the copyright holders for GVE.
> >
> > Signed-off-by: Rushil Gupta <rushilg@google.com>
> > Signed-off-by: Joshua Washington <joshwash@google.com>
> > Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
> > Signed-off-by: Jeroen de Borst <jeroendb@google.com>
>
> Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
>
Acked-by: Rushil Gupta <rushilg@google.com>
[-- Attachment #2: Type: text/html, Size: 1286 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v4 0/3] update license and copyright holders
2023-03-28 9:45 ` [PATCH v3 0/3] update license and copyright holders Junfeng Guo
` (2 preceding siblings ...)
2023-03-28 9:45 ` [PATCH v3 3/3] net/gve: add maintainers for GVE Junfeng Guo
@ 2023-03-29 2:26 ` Junfeng Guo
2023-03-29 2:27 ` [PATCH v4 1/3] net/gve: switch license from MIT to BSD-3 Junfeng Guo
` (2 more replies)
3 siblings, 3 replies; 38+ messages in thread
From: Junfeng Guo @ 2023-03-29 2:26 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing; +Cc: dev, Junfeng Guo
This patch set contains:
1. switch license from MIT to BSD-3 for GVE base code.
2. remove MIT license exception
3. add maintainers
4. update copyright holders for GVE
v4:
- update copyright holder for *_osdep.h file
v3:
- remove redundant blank line
v2:
- correct patch title & commit log
- separate the maintainers' file update into a different patch
Junfeng Guo (3):
net/gve: switch license from MIT to BSD-3
net/gve: update copyright holders
net/gve: add maintainers for GVE
.mailmap | 1 +
MAINTAINERS | 3 +++
drivers/net/gve/base/gve.h | 5 ++---
drivers/net/gve/base/gve_adminq.c | 5 ++---
drivers/net/gve/base/gve_adminq.h | 5 ++---
drivers/net/gve/base/gve_desc.h | 5 ++---
drivers/net/gve/base/gve_desc_dqo.h | 5 ++---
drivers/net/gve/base/gve_osdep.h | 3 ++-
drivers/net/gve/base/gve_register.h | 5 ++---
drivers/net/gve/gve_ethdev.c | 3 ++-
drivers/net/gve/gve_ethdev.h | 3 ++-
drivers/net/gve/gve_logs.h | 3 ++-
drivers/net/gve/gve_rx.c | 3 ++-
drivers/net/gve/gve_tx.c | 3 ++-
drivers/net/gve/meson.build | 3 ++-
license/exceptions.txt | 1 -
16 files changed, 30 insertions(+), 26 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v4 1/3] net/gve: switch license from MIT to BSD-3
2023-03-29 2:26 ` [PATCH v4 0/3] update license and copyright holders Junfeng Guo
@ 2023-03-29 2:27 ` Junfeng Guo
2023-03-29 8:08 ` Ferruh Yigit
2023-03-29 2:27 ` [PATCH v4 2/3] net/gve: update copyright holders Junfeng Guo
2023-03-29 2:27 ` [PATCH v4 3/3] net/gve: add maintainers for GVE Junfeng Guo
2 siblings, 1 reply; 38+ messages in thread
From: Junfeng Guo @ 2023-03-29 2:27 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing
Cc: dev, Junfeng Guo, Rushil Gupta, Joshua Washington, Jeroen de Borst
Switch license from MIT to BSD-3 for GVE base code.
In the meantime, remove MIT license exception for GVE driver.
Signed-off-by: Rushil Gupta <rushilg@google.com>
Signed-off-by: Joshua Washington <joshwash@google.com>
Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Signed-off-by: Jeroen de Borst <jeroendb@google.com>
---
.mailmap | 1 +
drivers/net/gve/base/gve.h | 5 ++---
drivers/net/gve/base/gve_adminq.c | 5 ++---
drivers/net/gve/base/gve_adminq.h | 5 ++---
drivers/net/gve/base/gve_desc.h | 5 ++---
drivers/net/gve/base/gve_desc_dqo.h | 5 ++---
drivers/net/gve/base/gve_register.h | 5 ++---
license/exceptions.txt | 1 -
8 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/.mailmap b/.mailmap
index dc30369117..9d66fa727c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -588,6 +588,7 @@ Jens Freimann <jfreimann@redhat.com> <jfreiman@redhat.com>
Jeremy Plsek <jplsek@iol.unh.edu>
Jeremy Spewock <jspewock@iol.unh.edu>
Jerin Jacob <jerinj@marvell.com> <jerin.jacob@caviumnetworks.com> <jerinjacobk@gmail.com>
+Jeroen de Borst <jeroendb@google.com>
Jerome Jutteau <jerome.jutteau@outscale.com>
Jerry Hao OS <jerryhao@os.amperecomputing.com>
Jerry Lilijun <jerry.lilijun@huawei.com>
diff --git a/drivers/net/gve/base/gve.h b/drivers/net/gve/base/gve.h
index 2dc4507acb..55b7c2688e 100644
--- a/drivers/net/gve/base/gve.h
+++ b/drivers/net/gve/base/gve.h
@@ -1,6 +1,5 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
*/
#ifndef _GVE_H_
diff --git a/drivers/net/gve/base/gve_adminq.c b/drivers/net/gve/base/gve_adminq.c
index e745b709b2..3519a2217f 100644
--- a/drivers/net/gve/base/gve_adminq.c
+++ b/drivers/net/gve/base/gve_adminq.c
@@ -1,6 +1,5 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
*/
#include "../gve_ethdev.h"
diff --git a/drivers/net/gve/base/gve_adminq.h b/drivers/net/gve/base/gve_adminq.h
index 05550119de..e6907fc16f 100644
--- a/drivers/net/gve/base/gve_adminq.h
+++ b/drivers/net/gve/base/gve_adminq.h
@@ -1,6 +1,5 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
*/
#ifndef _GVE_ADMINQ_H
diff --git a/drivers/net/gve/base/gve_desc.h b/drivers/net/gve/base/gve_desc.h
index 006b36442f..c62563f754 100644
--- a/drivers/net/gve/base/gve_desc.h
+++ b/drivers/net/gve/base/gve_desc.h
@@ -1,6 +1,5 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
*/
/* GVE Transmit Descriptor formats */
diff --git a/drivers/net/gve/base/gve_desc_dqo.h b/drivers/net/gve/base/gve_desc_dqo.h
index ee1afdecb8..d0887778d3 100644
--- a/drivers/net/gve/base/gve_desc_dqo.h
+++ b/drivers/net/gve/base/gve_desc_dqo.h
@@ -1,6 +1,5 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
*/
/* GVE DQO Descriptor formats */
diff --git a/drivers/net/gve/base/gve_register.h b/drivers/net/gve/base/gve_register.h
index c674167f31..615ceffc88 100644
--- a/drivers/net/gve/base/gve_register.h
+++ b/drivers/net/gve/base/gve_register.h
@@ -1,6 +1,5 @@
-/* SPDX-License-Identifier: MIT
- * Google Virtual Ethernet (gve) driver
- * Copyright (C) 2015-2022 Google, Inc.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022-2023 Google LLC
*/
#ifndef _GVE_REGISTER_H_
diff --git a/license/exceptions.txt b/license/exceptions.txt
index 1ded290eee..1bd4dbf8f7 100644
--- a/license/exceptions.txt
+++ b/license/exceptions.txt
@@ -16,5 +16,4 @@ SPDX Identifier TB Approval Date GB Approval Date File name
2.BSD-2-Clause 10/23/2019 12/18/2019 lib/eal/windows/include/getopt.h
3.ISC AND
BSD-2-Clause 10/23/2019 12/18/2019 lib/eal/windows/getopt.c
-4. MIT 10/19/2022 10/18/2022 drivers/net/gve/base/*
---------------------------------------------------------------------------------------------------
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v4 2/3] net/gve: update copyright holders
2023-03-29 2:26 ` [PATCH v4 0/3] update license and copyright holders Junfeng Guo
2023-03-29 2:27 ` [PATCH v4 1/3] net/gve: switch license from MIT to BSD-3 Junfeng Guo
@ 2023-03-29 2:27 ` Junfeng Guo
2023-03-29 2:27 ` [PATCH v4 3/3] net/gve: add maintainers for GVE Junfeng Guo
2 siblings, 0 replies; 38+ messages in thread
From: Junfeng Guo @ 2023-03-29 2:27 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing
Cc: dev, Junfeng Guo, Rushil Gupta, Joshua Washington, Jeroen de Borst
Add Google LLC as one of the copyright holders for GVE.
Signed-off-by: Rushil Gupta <rushilg@google.com>
Signed-off-by: Joshua Washington <joshwash@google.com>
Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Signed-off-by: Jeroen de Borst <jeroendb@google.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
Acked-by: Rushil Gupta <rushilg@google.com>
---
drivers/net/gve/base/gve_osdep.h | 3 ++-
drivers/net/gve/gve_ethdev.c | 3 ++-
drivers/net/gve/gve_ethdev.h | 3 ++-
drivers/net/gve/gve_logs.h | 3 ++-
drivers/net/gve/gve_rx.c | 3 ++-
drivers/net/gve/gve_tx.c | 3 ++-
drivers/net/gve/meson.build | 3 ++-
7 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/drivers/net/gve/base/gve_osdep.h b/drivers/net/gve/base/gve_osdep.h
index 7cb73002f4..02993d833b 100644
--- a/drivers/net/gve/base/gve_osdep.h
+++ b/drivers/net/gve/base/gve_osdep.h
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
*/
#ifndef _GVE_OSDEP_H_
diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c
index cf28a4a3b7..e1998cc864 100644
--- a/drivers/net/gve/gve_ethdev.c
+++ b/drivers/net/gve/gve_ethdev.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
*/
#include "gve_ethdev.h"
diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h
index 42a02cf5d4..64d5bb0f78 100644
--- a/drivers/net/gve/gve_ethdev.h
+++ b/drivers/net/gve/gve_ethdev.h
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
*/
#ifndef _GVE_ETHDEV_H_
diff --git a/drivers/net/gve/gve_logs.h b/drivers/net/gve/gve_logs.h
index 0d02da46e1..997a508f22 100644
--- a/drivers/net/gve/gve_logs.h
+++ b/drivers/net/gve/gve_logs.h
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
*/
#ifndef _GVE_LOGS_H_
diff --git a/drivers/net/gve/gve_rx.c b/drivers/net/gve/gve_rx.c
index 8d8f94efff..e8d5a8723b 100644
--- a/drivers/net/gve/gve_rx.c
+++ b/drivers/net/gve/gve_rx.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
*/
#include "gve_ethdev.h"
diff --git a/drivers/net/gve/gve_tx.c b/drivers/net/gve/gve_tx.c
index fee3b939c7..bbb954c9ea 100644
--- a/drivers/net/gve/gve_tx.c
+++ b/drivers/net/gve/gve_tx.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Intel Corporation
+ * Copyright (c) 2022-2023 Google LLC
+ * Copyright (c) 2022-2023 Intel Corporation
*/
#include "gve_ethdev.h"
diff --git a/drivers/net/gve/meson.build b/drivers/net/gve/meson.build
index af0010c01c..9cacccf2aa 100644
--- a/drivers/net/gve/meson.build
+++ b/drivers/net/gve/meson.build
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2022 Intel Corporation
+# Copyright (c) 2022-2023 Google LLC
+# Copyright (c) 2022-2023 Intel Corporation
if is_windows
build = false
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v4 3/3] net/gve: add maintainers for GVE
2023-03-29 2:26 ` [PATCH v4 0/3] update license and copyright holders Junfeng Guo
2023-03-29 2:27 ` [PATCH v4 1/3] net/gve: switch license from MIT to BSD-3 Junfeng Guo
2023-03-29 2:27 ` [PATCH v4 2/3] net/gve: update copyright holders Junfeng Guo
@ 2023-03-29 2:27 ` Junfeng Guo
2 siblings, 0 replies; 38+ messages in thread
From: Junfeng Guo @ 2023-03-29 2:27 UTC (permalink / raw)
To: qi.z.zhang, jingjing.wu, ferruh.yigit, beilei.xing
Cc: dev, Junfeng Guo, Rushil Gupta
Add maintainers from Google for GVE.
Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Signed-off-by: Rushil Gupta <rushilg@google.com>
---
MAINTAINERS | 3 +++
1 file changed, 3 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 1a33ad8592..988c7aecfa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini
Google Virtual Ethernet
M: Junfeng Guo <junfeng.guo@intel.com>
+M: Jeroen de Borst <jeroendb@google.com>
+M: Rushil Gupta <rushilg@google.com>
+M: Joshua Washington <joshwash@google.com>
F: drivers/net/gve/
F: doc/guides/nics/gve.rst
F: doc/guides/nics/features/gve.ini
--
2.34.1
^ permalink raw reply [flat|nested] 38+ messages in thread
* RE: [PATCH v3 1/3] net/gve: switch license from MIT to BSD-3
2023-03-28 10:36 ` Ferruh Yigit
@ 2023-03-29 2:35 ` Guo, Junfeng
0 siblings, 0 replies; 38+ messages in thread
From: Guo, Junfeng @ 2023-03-29 2:35 UTC (permalink / raw)
To: Ferruh Yigit, Zhang, Qi Z, Wu, Jingjing, Xing, Beilei
Cc: dev, Rushil Gupta, Joshua Washington, Jeroen de Borst
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@amd.com>
> Sent: Tuesday, March 28, 2023 18:36
> To: Guo, Junfeng <junfeng.guo@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Xing,
> Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org; Rushil Gupta <rushilg@google.com>; Joshua
> Washington <joshwash@google.com>; Jeroen de Borst
> <jeroendb@google.com>
> Subject: Re: [PATCH v3 1/3] net/gve: switch license from MIT to BSD-3
>
> On 3/28/2023 10:45 AM, Junfeng Guo wrote:
> > diff --git a/drivers/net/gve/base/gve_osdep.h
> b/drivers/net/gve/base/gve_osdep.h
> > index 7cb73002f4..f7d87fec16 100644
> > --- a/drivers/net/gve/base/gve_osdep.h
> > +++ b/drivers/net/gve/base/gve_osdep.h
> > @@ -1,5 +1,5 @@
> > /* SPDX-License-Identifier: BSD-3-Clause
> > - * Copyright(C) 2022 Intel Corporation
> > + * Copyright (c) 2022-2023 Google LLC
> > */
>
> Is this intentional to move Copyright from Intel to Google?
Oh, sorry! This is updated by mistake.
In tradition, the osdep.h file is in Intel's copyright with
BSD-3 License. So it should not be included in the patch
as no License update for this file.
I'll fix this and put this change into 2nd one of patch set.
Thanks for the careful review!
^ permalink raw reply [flat|nested] 38+ messages in thread
* RE: [PATCH v3 3/3] net/gve: add maintainers for GVE
2023-03-28 10:34 ` Ferruh Yigit
@ 2023-03-29 2:54 ` Guo, Junfeng
0 siblings, 0 replies; 38+ messages in thread
From: Guo, Junfeng @ 2023-03-29 2:54 UTC (permalink / raw)
To: Ferruh Yigit, Zhang, Qi Z, Wu, Jingjing, Xing, Beilei, rushilg
Cc: dev, Jeroen de Borst, Rushil Gupta, Joshua Washington, Thomas Monjalon
> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@amd.com>
> Sent: Tuesday, March 28, 2023 18:35
> To: Guo, Junfeng <junfeng.guo@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Xing,
> Beilei <beilei.xing@intel.com>; rushilg@google.com
> Cc: dev@dpdk.org; Jeroen de Borst <jeroendb@google.com>; Rushil
> Gupta <rushilg@google.com>; Joshua Washington
> <joshwash@google.com>; Thomas Monjalon <thomas@monjalon.net>
> Subject: Re: [PATCH v3 3/3] net/gve: add maintainers for GVE
>
> On 3/28/2023 11:00 AM, Guo, Junfeng wrote:
> > + Rushil Gupta <rushilg@google.com>
> >
> >> -----Original Message-----
> >> From: Guo, Junfeng <junfeng.guo@intel.com>
> >> Sent: Tuesday, March 28, 2023 17:45
> >> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Wu, Jingjing
> >> <jingjing.wu@intel.com>; ferruh.yigit@amd.com; Xing, Beilei
> >> <beilei.xing@intel.com>
> >> Cc: dev@dpdk.org; Guo, Junfeng <junfeng.guo@intel.com>
> >> Subject: [PATCH v3 3/3] net/gve: add maintainers for GVE
> >>
> >> Add maintainers from Google for GVE.
> >>
> >> Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
> >> ---
> >> MAINTAINERS | 3 +++
> >> 1 file changed, 3 insertions(+)
> >>
> >> diff --git a/MAINTAINERS b/MAINTAINERS
> >> index 1a33ad8592..988c7aecfa 100644
> >> --- a/MAINTAINERS
> >> +++ b/MAINTAINERS
> >> @@ -714,6 +714,9 @@ F: doc/guides/nics/features/enic.ini
> >>
> >> Google Virtual Ethernet
> >> M: Junfeng Guo <junfeng.guo@intel.com>
> >> +M: Jeroen de Borst <jeroendb@google.com>
> >> +M: Rushil Gupta <rushilg@google.com>
> >> +M: Joshua Washington <joshwash@google.com>
> >> F: drivers/net/gve/
> >> F: doc/guides/nics/gve.rst
> >> F: doc/guides/nics/features/gve.ini
>
>
> New maintainers were not part of the upstreaming process, so we don't
> know much about the engagement and commitment level of them.
>
> However, as far as I understand they are the base code owners, which
> means we can trust their technical expertise that is why good to have
> them on board.
>
>
> Primarily for due diligence, would it be OK to get explicit Ack from the
> new maintainers, to confirm they are aware of and agree to the
> responsibilities they are accepting?
Sure, that make sense. Thanks for your concern!
As you see, we have sent out the RFC code in past two months.
https://patchwork.dpdk.org/project/dpdk/list/?series=27056&state=*
Part of the code (e.g., base code update) are contributed by Google
team (also shown in the commit message Signed-off-by part).
At this point, as DPDK 23.07 window is coming. We decide to refine
the RFC code and upsteam them at this coming release.
To make things easier, this patch set is the first part to be upstream-ed.
This patch set mainly contains the license and copyright holders update.
And the following patch set for GVE enhancement will coming before
the V1 window.
So we may need your help to review this in advance and even get this
merged first. Thanks again for your careful review!
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v4 1/3] net/gve: switch license from MIT to BSD-3
2023-03-29 2:27 ` [PATCH v4 1/3] net/gve: switch license from MIT to BSD-3 Junfeng Guo
@ 2023-03-29 8:08 ` Ferruh Yigit
0 siblings, 0 replies; 38+ messages in thread
From: Ferruh Yigit @ 2023-03-29 8:08 UTC (permalink / raw)
To: Junfeng Guo, qi.z.zhang, jingjing.wu, beilei.xing
Cc: dev, Rushil Gupta, Joshua Washington, Jeroen de Borst
On 3/29/2023 3:27 AM, Junfeng Guo wrote:
> Switch license from MIT to BSD-3 for GVE base code.
> In the meantime, remove MIT license exception for GVE driver.
>
> Signed-off-by: Rushil Gupta <rushilg@google.com>
> Signed-off-by: Joshua Washington <joshwash@google.com>
> Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
> Signed-off-by: Jeroen de Borst <jeroendb@google.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 2/2] net/gve: update copyright holders
2023-03-28 9:35 ` Guo, Junfeng
2023-03-28 10:10 ` Ferruh Yigit
@ 2023-03-29 14:07 ` Thomas Monjalon
2023-03-30 7:20 ` Guo, Junfeng
1 sibling, 1 reply; 38+ messages in thread
From: Thomas Monjalon @ 2023-03-29 14:07 UTC (permalink / raw)
To: Ferruh Yigit, Zhang, Qi Z, Wu, Jingjing, Xing, Beilei, Guo, Junfeng
Cc: dev, Rushil Gupta, Joshua Washington, Jeroen de Borst
28/03/2023 11:35, Guo, Junfeng:
> The background is that, in the past (DPDK 22.11) we didn't get the approval
> of license from Google, thus chose the MIT License for the base code, and
> BSD-3 License for GVE common code (without the files in /base folder).
> We also left the copyright holder of base code just to Google Inc, and made
> Intel as the copyright holder of GVE common code (without /base folder).
>
> Today we are working together for GVE dev and maintaining. And we got
> the approval of BSD-3 License from Google for the base code.
> Thus we dicided to 1) switch the License of GVE base code from MIT to BSD-3;
> 2) add Google LLC as one of the copyright holders for GVE common code.
Do you realize we had lenghty discussions in the Technical Board,
the Governing Board, and with lawyers, just for this unneeded exception?
Now looking at the patches, there seem to be some big mistakes like
removing some copyright. I don't understand how it can be taken so lightly.
I regret how fast we were, next time we will surely operate differently.
If you want to improve the reputation of this driver,
please ask other copyright holders to be more active and responsive.
^ permalink raw reply [flat|nested] 38+ messages in thread
* RE: [PATCH 2/2] net/gve: update copyright holders
2023-03-29 14:07 ` Thomas Monjalon
@ 2023-03-30 7:20 ` Guo, Junfeng
2023-03-30 13:14 ` Thomas Monjalon
0 siblings, 1 reply; 38+ messages in thread
From: Guo, Junfeng @ 2023-03-30 7:20 UTC (permalink / raw)
To: Thomas Monjalon, Ferruh Yigit, Zhang, Qi Z, Wu, Jingjing, Xing,
Beilei, Rushil Gupta
Cc: dev, Joshua Washington, Jeroen de Borst
> -----Original Message-----
> From: Thomas Monjalon <thomas@monjalon.net>
> Sent: Wednesday, March 29, 2023 22:07
> To: Ferruh Yigit <ferruh.yigit@amd.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Xing,
> Beilei <beilei.xing@intel.com>; Guo, Junfeng <junfeng.guo@intel.com>
> Cc: dev@dpdk.org; Rushil Gupta <rushilg@google.com>; Joshua
> Washington <joshwash@google.com>; Jeroen de Borst
> <jeroendb@google.com>
> Subject: Re: [PATCH 2/2] net/gve: update copyright holders
>
> 28/03/2023 11:35, Guo, Junfeng:
> > The background is that, in the past (DPDK 22.11) we didn't get the
> approval
> > of license from Google, thus chose the MIT License for the base code,
> and
> > BSD-3 License for GVE common code (without the files in /base folder).
> > We also left the copyright holder of base code just to Google Inc, and
> made
> > Intel as the copyright holder of GVE common code (without /base
> folder).
> >
> > Today we are working together for GVE dev and maintaining. And we
> got
> > the approval of BSD-3 License from Google for the base code.
> > Thus we dicided to 1) switch the License of GVE base code from MIT to
> BSD-3;
> > 2) add Google LLC as one of the copyright holders for GVE common
> code.
>
> Do you realize we had lenghty discussions in the Technical Board,
> the Governing Board, and with lawyers, just for this unneeded exception?
>
> Now looking at the patches, there seem to be some big mistakes like
> removing some copyright. I don't understand how it can be taken so
> lightly.
>
> I regret how fast we were, next time we will surely operate differently.
> If you want to improve the reputation of this driver,
> please ask other copyright holders to be more active and responsive.
>
Really sorry for causing such severe trouble.
Yes, we did take lots of efforts in the Technical Board and the Governing
Board about this MIT exception. We really appreciate that.
About this patch set, it is my severe mistake to switch the MIT License
directly for the upstream-ed code in community, in the wrong way.
In the past we upstream-ed this driver with MIT License followed from
the kernel community's gve driver base code. And now we want to
use the code with BSD-3 License (approved by Google).
So I suppose that the correct way may be 1) first remove all these code
under MIT License and 2) then add the new files under BSD-3 License.
Please correct me if there are still misunderstanding in my statement.
Thanks Thomas for pointing out my mistake. I'll be careful to fix this.
Copyright holder for the gve base code will stay unchanged. Google LLC
will be added as one of the copyright holders for the gve common code.
@Rushil Gupta Please also be more active and responsive for the code
review and contribution in the community. Thanks!
>
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 2/2] net/gve: update copyright holders
2023-03-30 7:20 ` Guo, Junfeng
@ 2023-03-30 13:14 ` Thomas Monjalon
2023-03-30 15:18 ` Rushil Gupta
` (2 more replies)
0 siblings, 3 replies; 38+ messages in thread
From: Thomas Monjalon @ 2023-03-30 13:14 UTC (permalink / raw)
To: Ferruh Yigit, Zhang, Qi Z, Wu, Jingjing, Xing, Beilei,
Rushil Gupta, Guo, Junfeng
Cc: dev, Joshua Washington, Jeroen de Borst
30/03/2023 09:20, Guo, Junfeng:
> From: Thomas Monjalon <thomas@monjalon.net>
> > 28/03/2023 11:35, Guo, Junfeng:
> > > The background is that, in the past (DPDK 22.11) we didn't get the
> > approval
> > > of license from Google, thus chose the MIT License for the base code,
> > and
> > > BSD-3 License for GVE common code (without the files in /base folder).
> > > We also left the copyright holder of base code just to Google Inc, and
> > made
> > > Intel as the copyright holder of GVE common code (without /base
> > folder).
> > >
> > > Today we are working together for GVE dev and maintaining. And we
> > got
> > > the approval of BSD-3 License from Google for the base code.
> > > Thus we dicided to 1) switch the License of GVE base code from MIT to
> > BSD-3;
> > > 2) add Google LLC as one of the copyright holders for GVE common
> > code.
> >
> > Do you realize we had lenghty discussions in the Technical Board,
> > the Governing Board, and with lawyers, just for this unneeded exception?
> >
> > Now looking at the patches, there seem to be some big mistakes like
> > removing some copyright. I don't understand how it can be taken so
> > lightly.
> >
> > I regret how fast we were, next time we will surely operate differently.
> > If you want to improve the reputation of this driver,
> > please ask other copyright holders to be more active and responsive.
> >
>
> Really sorry for causing such severe trouble.
>
> Yes, we did take lots of efforts in the Technical Board and the Governing
> Board about this MIT exception. We really appreciate that.
>
> About this patch set, it is my severe mistake to switch the MIT License
> directly for the upstream-ed code in community, in the wrong way.
> In the past we upstream-ed this driver with MIT License followed from
> the kernel community's gve driver base code. And now we want to
> use the code with BSD-3 License (approved by Google).
> So I suppose that the correct way may be 1) first remove all these code
> under MIT License and 2) then add the new files under BSD-3 License.
The code under BSD is different of the MIT code?
If it is the same with a new approved license, you can just change the license.
> Please correct me if there are still misunderstanding in my statement.
> Thanks Thomas for pointing out my mistake. I'll be careful to fix this.
>
> Copyright holder for the gve base code will stay unchanged. Google LLC
> will be added as one of the copyright holders for the gve common code.
> @Rushil Gupta Please also be more active and responsive for the code
> review and contribution in the community. Thanks!
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 2/2] net/gve: update copyright holders
2023-03-30 13:14 ` Thomas Monjalon
@ 2023-03-30 15:18 ` Rushil Gupta
2023-03-30 15:26 ` Rushil Gupta
2023-03-31 2:32 ` Guo, Junfeng
2 siblings, 0 replies; 38+ messages in thread
From: Rushil Gupta @ 2023-03-30 15:18 UTC (permalink / raw)
To: Thomas Monjalon
Cc: Ferruh Yigit, Zhang, Qi Z, Wu, Jingjing, Xing, Beilei, Guo,
Junfeng, dev, Joshua Washington, Jeroen de Borst
[-- Attachment #1: Type: text/plain, Size: 3304 bytes --]
We were just trying to comply with the BSD license to get
rid of the exception. You have the MIT license for control path/admin-queue
code. Since admin-queue path is similar across linux, freebsd and dpdk the
code is similar but not exactly the same,
We are about to upstream driver code to FreeBSD under BSD license as well
so you will see this code under BSD license soon. I will consult the
lawyers on my end as well.
On Thu, Mar 30, 2023 at 6:14 AM Thomas Monjalon <thomas@monjalon.net> wrote:
> 30/03/2023 09:20, Guo, Junfeng:
> > From: Thomas Monjalon <thomas@monjalon.net>
> > > 28/03/2023 11:35, Guo, Junfeng:
> > > > The background is that, in the past (DPDK 22.11) we didn't get the
> > > approval
> > > > of license from Google, thus chose the MIT License for the base code,
> > > and
> > > > BSD-3 License for GVE common code (without the files in /base
> folder).
> > > > We also left the copyright holder of base code just to Google Inc,
> and
> > > made
> > > > Intel as the copyright holder of GVE common code (without /base
> > > folder).
> > > >
> > > > Today we are working together for GVE dev and maintaining. And we
> > > got
> > > > the approval of BSD-3 License from Google for the base code.
> > > > Thus we dicided to 1) switch the License of GVE base code from MIT to
> > > BSD-3;
> > > > 2) add Google LLC as one of the copyright holders for GVE common
> > > code.
> > >
> > > Do you realize we had lenghty discussions in the Technical Board,
> > > the Governing Board, and with lawyers, just for this unneeded
> exception?
> > >
> > > Now looking at the patches, there seem to be some big mistakes like
> > > removing some copyright. I don't understand how it can be taken so
> > > lightly.
> > >
> > > I regret how fast we were, next time we will surely operate
> differently.
> > > If you want to improve the reputation of this driver,
> > > please ask other copyright holders to be more active and responsive.
> > >
> >
> > Really sorry for causing such severe trouble.
> >
> > Yes, we did take lots of efforts in the Technical Board and the Governing
> > Board about this MIT exception. We really appreciate that.
> >
> > About this patch set, it is my severe mistake to switch the MIT License
> > directly for the upstream-ed code in community, in the wrong way.
> > In the past we upstream-ed this driver with MIT License followed from
> > the kernel community's gve driver base code. And now we want to
> > use the code with BSD-3 License (approved by Google).
> > So I suppose that the correct way may be 1) first remove all these code
> > under MIT License and 2) then add the new files under BSD-3 License.
>
> The code under BSD is different of the MIT code?
> If it is the same with a new approved license, you can just change the
> license.
>
> > Please correct me if there are still misunderstanding in my statement.
> > Thanks Thomas for pointing out my mistake. I'll be careful to fix this.
> >
> > Copyright holder for the gve base code will stay unchanged. Google LLC
> > will be added as one of the copyright holders for the gve common code.
> > @Rushil Gupta Please also be more active and responsive for the code
> > review and contribution in the community. Thanks!
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 4056 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH 2/2] net/gve: update copyright holders
2023-03-30 13:14 ` Thomas Monjalon
2023-03-30 15:18 ` Rushil Gupta
@ 2023-03-30 15:26 ` Rushil Gupta
2023-03-31 2:32 ` Guo, Junfeng
2 siblings, 0 replies; 38+ messages in thread
From: Rushil Gupta @ 2023-03-30 15:26 UTC (permalink / raw)
To: Thomas Monjalon
Cc: Ferruh Yigit, Zhang, Qi Z, Wu, Jingjing, Xing, Beilei, Guo,
Junfeng, dev, Joshua Washington, Jeroen de Borst
[-- Attachment #1: Type: text/plain, Size: 3301 bytes --]
On Thu, Mar 30, 2023 at 6:14 AM Thomas Monjalon <thomas@monjalon.net> wrote:
> 30/03/2023 09:20, Guo, Junfeng:
> > From: Thomas Monjalon <thomas@monjalon.net>
> > > 28/03/2023 11:35, Guo, Junfeng:
> > > > The background is that, in the past (DPDK 22.11) we didn't get the
> > > approval
> > > > of license from Google, thus chose the MIT License for the base code,
> > > and
> > > > BSD-3 License for GVE common code (without the files in /base
> folder).
> > > > We also left the copyright holder of base code just to Google Inc,
> and
> > > made
> > > > Intel as the copyright holder of GVE common code (without /base
> > > folder).
> > > >
> > > > Today we are working together for GVE dev and maintaining. And we
> > > got
> > > > the approval of BSD-3 License from Google for the base code.
> > > > Thus we dicided to 1) switch the License of GVE base code from MIT to
> > > BSD-3;
> > > > 2) add Google LLC as one of the copyright holders for GVE common
> > > code.
> > >
> > > Do you realize we had lenghty discussions in the Technical Board,
> > > the Governing Board, and with lawyers, just for this unneeded
> exception?
> > >
> > > Now looking at the patches, there seem to be some big mistakes like
> > > removing some copyright. I don't understand how it can be taken so
> > > lightly.
> > >
> > > I regret how fast we were, next time we will surely operate
> differently.
> > > If you want to improve the reputation of this driver,
> > > please ask other copyright holders to be more active and responsive.
> > >
> >
> > Really sorry for causing such severe trouble.
> >
> > Yes, we did take lots of efforts in the Technical Board and the Governing
> > Board about this MIT exception. We really appreciate that.
> >
> > About this patch set, it is my severe mistake to switch the MIT License
> > directly for the upstream-ed code in community, in the wrong way.
> > In the past we upstream-ed this driver with MIT License followed from
> > the kernel community's gve driver base code. And now we want to
> > use the code with BSD-3 License (approved by Google).
> > So I suppose that the correct way may be 1) first remove all these code
> > under MIT License and 2) then add the new files under BSD-3 License.
>
> The code under BSD is different of the MIT code?
> If it is the same with a new approved license, you can just change the
> license.
>
> > Please correct me if there are still misunderstanding in my statement.
> > Thanks Thomas for pointing out my mistake. I'll be careful to fix this.
> >
> > Copyright holder for the gve base code will stay unchanged. Google LLC
> > will be added as one of the copyright holders for the gve common code.
> > @Rushil Gupta Please also be more active and responsive for the code
> > review and contribution in the community. Thanks!
>
>
>
> We were just trying to comply with the BSD license to get
rid of the exception. You have the MIT license for control path/admin-queue
code. Since admin-queue path is similar across linux, freebsd and dpdk the
code is similar but not exactly the same,
We are about to upstream driver code to FreeBSD under BSD license as well
so you will see this code under BSD license soon. I will consult the
lawyers on my end as well.
[-- Attachment #2: Type: text/html, Size: 5624 bytes --]
^ permalink raw reply [flat|nested] 38+ messages in thread
* RE: [PATCH 2/2] net/gve: update copyright holders
2023-03-30 13:14 ` Thomas Monjalon
2023-03-30 15:18 ` Rushil Gupta
2023-03-30 15:26 ` Rushil Gupta
@ 2023-03-31 2:32 ` Guo, Junfeng
2 siblings, 0 replies; 38+ messages in thread
From: Guo, Junfeng @ 2023-03-31 2:32 UTC (permalink / raw)
To: Thomas Monjalon, Ferruh Yigit, Zhang, Qi Z, Wu, Jingjing, Xing,
Beilei, Rushil Gupta
Cc: dev, Joshua Washington, Jeroen de Borst
> -----Original Message-----
> From: Thomas Monjalon <thomas@monjalon.net>
> Sent: Thursday, March 30, 2023 21:14
> To: Ferruh Yigit <ferruh.yigit@amd.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Xing,
> Beilei <beilei.xing@intel.com>; Rushil Gupta <rushilg@google.com>; Guo,
> Junfeng <junfeng.guo@intel.com>
> Cc: dev@dpdk.org; Joshua Washington <joshwash@google.com>; Jeroen
> de Borst <jeroendb@google.com>
> Subject: Re: [PATCH 2/2] net/gve: update copyright holders
>
> 30/03/2023 09:20, Guo, Junfeng:
> > From: Thomas Monjalon <thomas@monjalon.net>
> > > 28/03/2023 11:35, Guo, Junfeng:
> > > > The background is that, in the past (DPDK 22.11) we didn't get the
> > > approval
> > > > of license from Google, thus chose the MIT License for the base
> code,
> > > and
> > > > BSD-3 License for GVE common code (without the files in /base
> folder).
> > > > We also left the copyright holder of base code just to Google Inc,
> and
> > > made
> > > > Intel as the copyright holder of GVE common code (without /base
> > > folder).
> > > >
> > > > Today we are working together for GVE dev and maintaining. And
> we
> > > got
> > > > the approval of BSD-3 License from Google for the base code.
> > > > Thus we dicided to 1) switch the License of GVE base code from MIT
> to
> > > BSD-3;
> > > > 2) add Google LLC as one of the copyright holders for GVE common
> > > code.
> > >
> > > Do you realize we had lenghty discussions in the Technical Board,
> > > the Governing Board, and with lawyers, just for this unneeded
> exception?
> > >
> > > Now looking at the patches, there seem to be some big mistakes like
> > > removing some copyright. I don't understand how it can be taken so
> > > lightly.
> > >
> > > I regret how fast we were, next time we will surely operate differently.
> > > If you want to improve the reputation of this driver,
> > > please ask other copyright holders to be more active and responsive.
> > >
> >
> > Really sorry for causing such severe trouble.
> >
> > Yes, we did take lots of efforts in the Technical Board and the Governing
> > Board about this MIT exception. We really appreciate that.
> >
> > About this patch set, it is my severe mistake to switch the MIT License
> > directly for the upstream-ed code in community, in the wrong way.
> > In the past we upstream-ed this driver with MIT License followed from
> > the kernel community's gve driver base code. And now we want to
> > use the code with BSD-3 License (approved by Google).
> > So I suppose that the correct way may be 1) first remove all these code
> > under MIT License and 2) then add the new files under BSD-3 License.
>
> The code under BSD is different of the MIT code?
> If it is the same with a new approved license, you can just change the
> license.
For this patch set, the code lines remain unchanged.
We want to use BSD licensed source files to replace the MIT licensed ones.
This patch set is mainly used to for the license related purpose.
You can check the latest v4 patch set:
https://patchwork.dpdk.org/project/dpdk/list/?series=27570&state=*
Sorry about the misleading titles and statements in this patch set, that
cause the misunderstanding of changing license/copyright unconsidered.
As Rushil replied, Google is about to upstream driver code to FreeBSD
under BSD license as well so we will see this code under BSD license soon.
And he will consult the lawyers on his end as well.
Thanks
>
> > Please correct me if there are still misunderstanding in my statement.
> > Thanks Thomas for pointing out my mistake. I'll be careful to fix this.
> >
> > Copyright holder for the gve base code will stay unchanged. Google LLC
> > will be added as one of the copyright holders for the gve common code.
> > @Rushil Gupta Please also be more active and responsive for the code
> > review and contribution in the community. Thanks!
>
>
^ permalink raw reply [flat|nested] 38+ messages in thread
end of thread, other threads:[~2023-03-31 2:32 UTC | newest]
Thread overview: 38+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-28 2:08 [PATCH 0/2] update license and copyright Junfeng Guo
2023-03-28 2:08 ` [PATCH 1/2] net/gve: switch copyright from MIT to BSD-3 Junfeng Guo
2023-03-28 8:51 ` Ferruh Yigit
2023-03-28 8:57 ` Guo, Junfeng
2023-03-28 8:55 ` Ferruh Yigit
2023-03-28 9:06 ` Guo, Junfeng
2023-03-28 9:09 ` Ferruh Yigit
2023-03-28 9:35 ` Guo, Junfeng
2023-03-28 2:08 ` [PATCH 2/2] net/gve: update copyright holders Junfeng Guo
2023-03-28 8:56 ` Ferruh Yigit
2023-03-28 9:35 ` Guo, Junfeng
2023-03-28 10:10 ` Ferruh Yigit
2023-03-29 14:07 ` Thomas Monjalon
2023-03-30 7:20 ` Guo, Junfeng
2023-03-30 13:14 ` Thomas Monjalon
2023-03-30 15:18 ` Rushil Gupta
2023-03-30 15:26 ` Rushil Gupta
2023-03-31 2:32 ` Guo, Junfeng
2023-03-28 9:28 ` [PATCH v2 0/3] update license and " Junfeng Guo
2023-03-28 9:28 ` [PATCH v2 1/3] net/gve: switch license from MIT to BSD-3 Junfeng Guo
2023-03-28 9:28 ` [PATCH v2 2/3] net/gve: update copyright holders Junfeng Guo
2023-03-28 9:28 ` [PATCH v2 3/3] net/gve: add maintainers for GVE Junfeng Guo
2023-03-28 9:45 ` [PATCH v3 0/3] update license and copyright holders Junfeng Guo
2023-03-28 9:45 ` [PATCH v3 1/3] net/gve: switch license from MIT to BSD-3 Junfeng Guo
2023-03-28 10:36 ` Ferruh Yigit
2023-03-29 2:35 ` Guo, Junfeng
2023-03-28 9:45 ` [PATCH v3 2/3] net/gve: update copyright holders Junfeng Guo
2023-03-28 10:37 ` Ferruh Yigit
2023-03-28 22:11 ` Rushil Gupta
2023-03-28 9:45 ` [PATCH v3 3/3] net/gve: add maintainers for GVE Junfeng Guo
2023-03-28 10:00 ` Guo, Junfeng
2023-03-28 10:34 ` Ferruh Yigit
2023-03-29 2:54 ` Guo, Junfeng
2023-03-29 2:26 ` [PATCH v4 0/3] update license and copyright holders Junfeng Guo
2023-03-29 2:27 ` [PATCH v4 1/3] net/gve: switch license from MIT to BSD-3 Junfeng Guo
2023-03-29 8:08 ` Ferruh Yigit
2023-03-29 2:27 ` [PATCH v4 2/3] net/gve: update copyright holders Junfeng Guo
2023-03-29 2:27 ` [PATCH v4 3/3] net/gve: add maintainers for GVE Junfeng Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).