Skip to contentSkip to conversation

ionic: make spdxcheck.py happy

PATCH Applied Lukas Bulwahn 3 participants 3 messages Mar 21, 2020 – Mar 22, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 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(-)
drivers/net/ethernet/pensando/ionic/ionic_if.h +1 -1
index 54547d53b0f2..51adf5059834 100644
@@ -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_
drivers/net/ethernet/pensando/ionic/ionic_regs.h +1 -1
index 03ee5a36472b..2e174f45c030 100644
@@ -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
Signature · 1 line
2.17.1
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · 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

Quoted 6 lines

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.

Quoted 25 lines
---
  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(-)
drivers/net/ethernet/pensando/ionic/ionic_if.h +1 -1
index 54547d53b0f2..51adf5059834 100644
@@ -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_
drivers/net/ethernet/pensando/ionic/ionic_regs.h +1 -1
index 03ee5a36472b..2e174f45c030 100644
@@ -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
maintainer Applied
#2 lore raw
In reply to Lukas Bulwahn

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

Quoted 7 lines

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

Quoted 6 lines

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.

Applied, thank you.