linux-spdx.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ionic: make spdxcheck.py happy
@ 2020-03-21 12:05 Lukas Bulwahn
  2020-03-21 18:47 ` Shannon Nelson
  2020-03-22  2:54 ` David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: Lukas Bulwahn @ 2020-03-21 12:05 UTC (permalink / raw)
  To: Shannon Nelson, netdev; +Cc: linux-spdx, linux-kernel, Lukas Bulwahn

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 <lukas.bulwahn@gmail.com>
---
 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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] ionic: make spdxcheck.py happy
  2020-03-21 12:05 [PATCH] ionic: make spdxcheck.py happy Lukas Bulwahn
@ 2020-03-21 18:47 ` Shannon Nelson
  2020-03-22  2:54 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: Shannon Nelson @ 2020-03-21 18:47 UTC (permalink / raw)
  To: Lukas Bulwahn, netdev; +Cc: linux-spdx, linux-kernel

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 <lukas.bulwahn@gmail.com>

Acked-by: Shannon Nelson <snelson@pensando.io>

> ---
>   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


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] ionic: make spdxcheck.py happy
  2020-03-21 12:05 [PATCH] ionic: make spdxcheck.py happy Lukas Bulwahn
  2020-03-21 18:47 ` Shannon Nelson
@ 2020-03-22  2:54 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2020-03-22  2:54 UTC (permalink / raw)
  To: lukas.bulwahn; +Cc: snelson, netdev, linux-spdx, linux-kernel

From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
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 <lukas.bulwahn@gmail.com>

Applied, thank you.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-03-22  2:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-21 12:05 [PATCH] ionic: make spdxcheck.py happy Lukas Bulwahn
2020-03-21 18:47 ` Shannon Nelson
2020-03-22  2:54 ` David Miller

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).