Message ID | 20221018194131.23006-9-andrew.boyer@amd.com (mailing list archive) |
---|---|
State | Accepted, archived |
Delegated to: | Ferruh Yigit |
Headers | |
Series | net/ionic: updates for 22.11 release | |
Checks
Context | Check | Description |
---|---|---|
ci/checkpatch | success | coding style OK |
Commit Message
diff --git a/doc/guides/nics/ionic.rst b/doc/guides/nics/ionic.rst index f2cdd2b571..216f820736 100644 --- a/doc/guides/nics/ionic.rst +++ b/doc/guides/nics/ionic.rst @@ -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. IONIC Driver diff --git a/drivers/net/ionic/ionic.h b/drivers/net/ionic/ionic.h index 986408ad31..a05bf4ee71 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. */ diff --git a/drivers/net/ionic/ionic_dev.c b/drivers/net/ionic/ionic_dev.c index c891a51e03..27abc29da4 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. */ diff --git a/drivers/net/ionic/ionic_dev.h b/drivers/net/ionic/ionic_dev.h index c814301451..fabc21834a 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. */ diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index d85162ee3f..2b7c05a9f2 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. */ diff --git a/drivers/net/ionic/ionic_ethdev.h b/drivers/net/ionic/ionic_ethdev.h index b5b1212bfa..4762ba7a9d 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. */ diff --git a/drivers/net/ionic/ionic_if.h b/drivers/net/ionic/ionic_if.h index 0e99df8cc2..c9c4a9dee4 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. */ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright 2017-2022 Advanced Micro Devices, Inc. + */ #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 27002b8142..0d167f677f 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. */ diff --git a/drivers/net/ionic/ionic_lif.h b/drivers/net/ionic/ionic_lif.h index c11c1f35da..b37841b69f 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. */ diff --git a/drivers/net/ionic/ionic_logs.h b/drivers/net/ionic/ionic_logs.h index a4ebac346c..c10b06c051 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. */ diff --git a/drivers/net/ionic/ionic_mac_api.c b/drivers/net/ionic/ionic_mac_api.c index 71775dcf95..baf6047921 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. */ diff --git a/drivers/net/ionic/ionic_mac_api.h b/drivers/net/ionic/ionic_mac_api.h index 4ab8555c24..78202d44c6 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. */ diff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c index 066cd98617..11b8a8a44b 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. */ diff --git a/drivers/net/ionic/ionic_osdep.h b/drivers/net/ionic/ionic_osdep.h index 5776a2944f..68f767b920 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. */ diff --git a/drivers/net/ionic/ionic_regs.h b/drivers/net/ionic/ionic_regs.h index 1b17540690..b4c665a58d 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. */ diff --git a/drivers/net/ionic/ionic_rx_filter.c b/drivers/net/ionic/ionic_rx_filter.c index 448afefddd..bbfc217826 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. */ diff --git a/drivers/net/ionic/ionic_rx_filter.h b/drivers/net/ionic/ionic_rx_filter.h index a3401c6e53..5500c7d70b 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. */ diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c index 96896aec2b..ffca26dd3e 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. */ diff --git a/drivers/net/ionic/ionic_rxtx.h b/drivers/net/ionic/ionic_rxtx.h index 1a8b9c0117..e55e86c8b3 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. */ diff --git a/drivers/net/ionic/meson.build b/drivers/net/ionic/meson.build index 76389f9213..d122686b5a 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. if is_windows