2020-03-21 12:06:02

by Lukas Bulwahn

Subject: [PATCH] ionic: make spdxcheck.py happy

Headers ionic_if.h and ionic_regs.h are licensed under three alternative
licenses and the used SPDX-License-Identifier expression makes
./scripts/spdxcheck.py complain:

drivers/net/ethernet/pensando/ionic/ionic_if.h: 1:52 Syntax error: OR
drivers/net/ethernet/pensando/ionic/ionic_regs.h: 1:52 Syntax error: OR

As OR is associative, it is irrelevant if the parentheses are put around
the first or the second OR-expression.

Simply add parentheses to make spdxcheck.py happy.

Signed-off-by: Lukas Bulwahn <[email protected]>
---
drivers/net/ethernet/pensando/ionic/ionic_if.h | 2 +-
drivers/net/ethernet/pensando/ionic/ionic_regs.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_if.h b/drivers/net/ethernet/pensando/ionic/ionic_if.h
index 54547d53b0f2..51adf5059834 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_if.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic_if.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB OR BSD-2-Clause */
+/* SPDX-License-Identifier: (GPL-2.0 OR Linux-OpenIB) OR BSD-2-Clause */
/* Copyright (c) 2017-2019 Pensando Systems, Inc. All rights reserved. */

#ifndef _IONIC_IF_H_
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_regs.h b/drivers/net/ethernet/pensando/ionic/ionic_regs.h
index 03ee5a36472b..2e174f45c030 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_regs.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic_regs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB OR BSD-2-Clause */
+/* SPDX-License-Identifier: (GPL-2.0 OR Linux-OpenIB) OR BSD-2-Clause */
/* Copyright (c) 2018-2019 Pensando Systems, Inc. All rights reserved. */

#ifndef IONIC_REGS_H
--
2.17.1

2020-03-21 18:48:24

by Shannon Nelson

Subject: Re: [PATCH] ionic: make spdxcheck.py happy

On 3/21/20 5:05 AM, Lukas Bulwahn wrote:
> Headers ionic_if.h and ionic_regs.h are licensed under three alternative
> licenses and the used SPDX-License-Identifier expression makes
> ./scripts/spdxcheck.py complain:
>
> drivers/net/ethernet/pensando/ionic/ionic_if.h: 1:52 Syntax error: OR
> drivers/net/ethernet/pensando/ionic/ionic_regs.h: 1:52 Syntax error: OR
>
> As OR is associative, it is irrelevant if the parentheses are put around
> the first or the second OR-expression.
>
> Simply add parentheses to make spdxcheck.py happy.
>
> Signed-off-by: Lukas Bulwahn <[email protected]>

Acked-by: Shannon Nelson <[email protected]>

> ---
> drivers/net/ethernet/pensando/ionic/ionic_if.h | 2 +-
> drivers/net/ethernet/pensando/ionic/ionic_regs.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_if.h b/drivers/net/ethernet/pensando/ionic/ionic_if.h
> index 54547d53b0f2..51adf5059834 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_if.h
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_if.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB OR BSD-2-Clause */
> +/* SPDX-License-Identifier: (GPL-2.0 OR Linux-OpenIB) OR BSD-2-Clause */
> /* Copyright (c) 2017-2019 Pensando Systems, Inc. All rights reserved. */
>
> #ifndef _IONIC_IF_H_
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_regs.h b/drivers/net/ethernet/pensando/ionic/ionic_regs.h
> index 03ee5a36472b..2e174f45c030 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_regs.h
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_regs.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB OR BSD-2-Clause */
> +/* SPDX-License-Identifier: (GPL-2.0 OR Linux-OpenIB) OR BSD-2-Clause */
> /* Copyright (c) 2018-2019 Pensando Systems, Inc. All rights reserved. */
>
> #ifndef IONIC_REGS_H

2020-03-22 02:54:47

by David Miller

Subject: Re: [PATCH] ionic: make spdxcheck.py happy

From: Lukas Bulwahn <[email protected]>
Date: Sat, 21 Mar 2020 13:05:14 +0100

> Headers ionic_if.h and ionic_regs.h are licensed under three alternative
> licenses and the used SPDX-License-Identifier expression makes
> ./scripts/spdxcheck.py complain:
>
> drivers/net/ethernet/pensando/ionic/ionic_if.h: 1:52 Syntax error: OR
> drivers/net/ethernet/pensando/ionic/ionic_regs.h: 1:52 Syntax error: OR
>
> As OR is associative, it is irrelevant if the parentheses are put around
> the first or the second OR-expression.
>
> Simply add parentheses to make spdxcheck.py happy.
>
> Signed-off-by: Lukas Bulwahn <[email protected]>

Applied, thank you.