Remove GPL2 and leave only BSD-3-Clause. This is more in line with the norms of the DPDK community.
Signed-off-by: Andrew Boyer <andrew.bo...@amd.com> --- drivers/net/ionic/ionic.h | 2 +- drivers/net/ionic/ionic_dev.c | 2 +- drivers/net/ionic/ionic_dev.h | 2 +- drivers/net/ionic/ionic_ethdev.c | 2 +- drivers/net/ionic/ionic_ethdev.h | 2 +- drivers/net/ionic/ionic_if.h | 5 +++-- drivers/net/ionic/ionic_lif.c | 2 +- drivers/net/ionic/ionic_lif.h | 2 +- drivers/net/ionic/ionic_logs.h | 2 +- drivers/net/ionic/ionic_mac_api.c | 2 +- drivers/net/ionic/ionic_mac_api.h | 2 +- drivers/net/ionic/ionic_main.c | 2 +- drivers/net/ionic/ionic_osdep.h | 2 +- drivers/net/ionic/ionic_regs.h | 2 +- drivers/net/ionic/ionic_rx_filter.c | 2 +- drivers/net/ionic/ionic_rx_filter.h | 2 +- drivers/net/ionic/ionic_rxtx.c | 2 +- drivers/net/ionic/ionic_rxtx.h | 2 +- drivers/net/ionic/meson.build | 2 +- 19 files changed, 21 insertions(+), 20 deletions(-) diff --git a/drivers/net/ionic/ionic.h b/drivers/net/ionic/ionic.h index 31837f050d..7578cd31bf 100644 --- a/drivers/net/ionic/ionic.h +++ b/drivers/net/ionic/ionic.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_dev.c b/drivers/net/ionic/ionic_dev.c index a266ea7ddf..a631523e59 100644 --- a/drivers/net/ionic/ionic_dev.c +++ b/drivers/net/ionic/ionic_dev.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_dev.h b/drivers/net/ionic/ionic_dev.h index 42d192026b..3b902554b8 100644 --- a/drivers/net/ionic/ionic_dev.h +++ b/drivers/net/ionic/ionic_dev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index c696311a18..387042c080 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_ethdev.h b/drivers/net/ionic/ionic_ethdev.h index afe4a67743..d1ed293604 100644 --- a/drivers/net/ionic/ionic_ethdev.h +++ b/drivers/net/ionic/ionic_ethdev.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_if.h b/drivers/net/ionic/ionic_if.h index 696ca9806e..761d366c71 100644 --- a/drivers/net/ionic/ionic_if.h +++ b/drivers/net/ionic/ionic_if.h @@ -1,5 +1,6 @@ -/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB OR BSD-3-Clause */ -/* Copyright 2017-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2017-2022 Advanced Micro Devices, Inc. All Rights Reserved. + */ #ifndef _IONIC_IF_H_ #define _IONIC_IF_H_ diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index f0c774c1cb..dc21387cd8 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_lif.h b/drivers/net/ionic/ionic_lif.h index bb65184f96..4aebfe20d0 100644 --- a/drivers/net/ionic/ionic_lif.h +++ b/drivers/net/ionic/ionic_lif.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_logs.h b/drivers/net/ionic/ionic_logs.h index 9c96112b9d..9b17303e42 100644 --- a/drivers/net/ionic/ionic_logs.h +++ b/drivers/net/ionic/ionic_logs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_mac_api.c b/drivers/net/ionic/ionic_mac_api.c index 6b48a311ec..0464a7b13c 100644 --- a/drivers/net/ionic/ionic_mac_api.c +++ b/drivers/net/ionic/ionic_mac_api.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_mac_api.h b/drivers/net/ionic/ionic_mac_api.h index 7db788fd01..766c7733c8 100644 --- a/drivers/net/ionic/ionic_mac_api.h +++ b/drivers/net/ionic/ionic_mac_api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c index 3f85a155e0..b42430713c 100644 --- a/drivers/net/ionic/ionic_main.c +++ b/drivers/net/ionic/ionic_main.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_osdep.h b/drivers/net/ionic/ionic_osdep.h index 9ea90b8edd..c6d77c0fae 100644 --- a/drivers/net/ionic/ionic_osdep.h +++ b/drivers/net/ionic/ionic_osdep.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_regs.h b/drivers/net/ionic/ionic_regs.h index da7b1614a1..dbf5388268 100644 --- a/drivers/net/ionic/ionic_regs.h +++ b/drivers/net/ionic/ionic_regs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_rx_filter.c b/drivers/net/ionic/ionic_rx_filter.c index 6d3b0362c8..fdedb9e288 100644 --- a/drivers/net/ionic/ionic_rx_filter.c +++ b/drivers/net/ionic/ionic_rx_filter.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_rx_filter.h b/drivers/net/ionic/ionic_rx_filter.h index cd176c9f52..e6cd06f002 100644 --- a/drivers/net/ionic/ionic_rx_filter.h +++ b/drivers/net/ionic/ionic_rx_filter.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c index 82e333ea13..acdfda9312 100644 --- a/drivers/net/ionic/ionic_rxtx.c +++ b/drivers/net/ionic/ionic_rxtx.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/ionic_rxtx.h b/drivers/net/ionic/ionic_rxtx.h index ff49d52fff..91a9073803 100644 --- a/drivers/net/ionic/ionic_rxtx.h +++ b/drivers/net/ionic/ionic_rxtx.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +/* SPDX-License-Identifier: BSD-3-Clause * Copyright 2018-2022 Advanced Micro Devices, Inc. All Rights Reserved. */ diff --git a/drivers/net/ionic/meson.build b/drivers/net/ionic/meson.build index c338515e27..e251e7cbe0 100644 --- a/drivers/net/ionic/meson.build +++ b/drivers/net/ionic/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) +# SPDX-License-Identifier: BSD-3-Clause # Copyright 2019-2022 Advanced Micro Devices, Inc. All Rights Reserved. if is_windows -- 2.17.1
