From: Neil Armstrong <neil.armstrong@linaro.org>
To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
Linus Walleij <linus.walleij@linaro.org>,
Kevin Hilman <khilman@baylibre.com>,
Jerome Brunet <jbrunet@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] pinctrl: use capital "OR" for multiple licenses in SPDX
Date: Wed, 23 Aug 2023 11:02:45 +0200 [thread overview]
Message-ID: <c18d607e-e33e-43fd-9a67-c701f92cc004@linaro.org> (raw)
In-Reply-To: <20230823085546.116494-1-krzysztof.kozlowski@linaro.org>
On 23/08/2023 10:55, Krzysztof Kozlowski wrote:
> Documentation/process/license-rules.rst and checkpatch expect the SPDX
> identifier syntax for multiple licenses to use capital "OR". Correct it
> to keep consistent format and avoid copy-paste issues.
>
> Correct also the placement of SPDX identifier in pinctrl-meson-axg
> files:
>
> WARNING: Misplaced SPDX-License-Identifier tag - use line 1 instead
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
> drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 3 +--
> drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h | 2 +-
> drivers/pinctrl/meson/pinctrl-meson-axg.c | 3 +--
> drivers/pinctrl/meson/pinctrl-meson-g12a.c | 2 +-
> drivers/pinctrl/pinctrl-mlxbf3.c | 2 +-
> 5 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
> index 80c43683c789..ae3f8d0da05f 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> /*
> * Second generation of pinmux driver for Amlogic Meson-AXG SoC.
> *
> @@ -6,8 +7,6 @@
> *
> * Copyright (c) 2017 Amlogic, Inc. All rights reserved.
> * Author: Xingyu Chen <xingyu.chen@amlogic.com>
> - *
> - * SPDX-License-Identifier: (GPL-2.0+ or MIT)
> */
>
> /*
> diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h
> index aa79d7ecee00..67147ebaef1b 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h
> +++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */
> +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
> /*
> * Copyright (c) 2017 Baylibre SAS.
> * Author: Jerome Brunet <jbrunet@baylibre.com>
> diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c
> index d249a035c2b9..6667c9d0238f 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
> @@ -1,10 +1,9 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> /*
> * Pin controller and GPIO driver for Amlogic Meson AXG SoC.
> *
> * Copyright (c) 2017 Amlogic, Inc. All rights reserved.
> * Author: Xingyu Chen <xingyu.chen@amlogic.com>
> - *
> - * SPDX-License-Identifier: (GPL-2.0+ or MIT)
> */
>
> #include <dt-bindings/gpio/meson-axg-gpio.h>
> diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
> index 3cd86d6a0a60..2c17891ba6a9 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0+ or MIT)
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> /*
> * Pin controller and GPIO driver for Amlogic Meson G12A SoC.
> *
For meson pinctrl drivers:
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
<snip>
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
next prev parent reply other threads:[~2023-08-23 9:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-23 8:55 [PATCH] pinctrl: use capital "OR" for multiple licenses in SPDX Krzysztof Kozlowski
2023-08-23 9:02 ` Neil Armstrong [this message]
2023-08-23 12:32 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c18d607e-e33e-43fd-9a67-c701f92cc004@linaro.org \
--to=neil.armstrong@linaro.org \
--cc=jbrunet@baylibre.com \
--cc=khilman@baylibre.com \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.blumenstingl@googlemail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox