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 <rush...@google.com> Signed-off-by: Joshua Washington <joshw...@google.com> Signed-off-by: Junfeng Guo <junfeng....@intel.com> Signed-off-by: Jeroen de Borst <jeroe...@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 <jfreim...@redhat.com> <jfrei...@redhat.com> Jeremy Plsek <jpl...@iol.unh.edu> Jeremy Spewock <jspew...@iol.unh.edu> Jerin Jacob <jer...@marvell.com> <jerin.ja...@caviumnetworks.com> <jerinjac...@gmail.com> +Jeroen de Borst <jeroe...@google.com> Jerome Jutteau <jerome.jutt...@outscale.com> Jerry Hao OS <jerry...@os.amperecomputing.com> Jerry Lilijun <jerry.lili...@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
