| Message ID | 20230823085238.113642-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | riscv: dts: use capital "OR" for multiple licenses in SPDX | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/cover_letter | success | Single patches do not need cover letters |
| conchuod/tree_selection | success | Guessed tree name to be for-next at HEAD 9f944d2e0ab3 |
| conchuod/fixes_present | success | Fixes tag not required for -next series |
| conchuod/maintainers_pattern | success | MAINTAINERS pattern errors before the patch: 4 and now 4 |
| conchuod/verify_signedoff | success | Signed-off-by tag matches author and committer |
| conchuod/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| conchuod/build_rv64_clang_allmodconfig | success | Errors and warnings before: 9 this patch: 9 |
| conchuod/module_param | success | Was 0 now: 0 |
| conchuod/build_rv64_gcc_allmodconfig | success | Errors and warnings before: 9 this patch: 9 |
| conchuod/build_rv32_defconfig | success | Build OK |
| conchuod/dtb_warn_rv64 | success | Errors and warnings before: 12 this patch: 12 |
| conchuod/header_inline | success | No static functions without inline keyword in header files |
| conchuod/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 70 lines checked |
| conchuod/build_rv64_nommu_k210_defconfig | success | Build OK |
| conchuod/verify_fixes | success | No Fixes tag |
| conchuod/build_rv64_nommu_virt_defconfig | success | Build OK |
On Wed, Aug 23, 2023 at 10:52:38AM +0200, 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. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor.
Dne sreda, 23. avgust 2023 ob 10:52:38 CEST je Krzysztof Kozlowski napisal(a): > 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. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > --- > > Rebased on next-20230822, so might not apply cleanly. What does not > apply, can be skipped and I will fix it after next RC. > --- > arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts | 2 +- > .../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts | 2 +- > .../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 2 +- > arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi | 2 +- > arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 2 +- Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> sunxi DT changes are already closed for 6.5. I can take it after -rc1 for 6.6. Best regards, Jernej
On 23/08/2023 21:13, Jernej Škrabec wrote: > Dne sreda, 23. avgust 2023 ob 10:52:38 CEST je Krzysztof Kozlowski napisal(a): >> 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. >> >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >> >> --- >> >> Rebased on next-20230822, so might not apply cleanly. What does not >> apply, can be skipped and I will fix it after next RC. >> --- >> arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi | 2 +- >> arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts | 2 +- >> .../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts | 2 +- >> .../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts | 2 +- >> arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi | 2 +- >> arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts | 2 +- >> arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts | 2 +- >> arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts | 2 +- >> arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts | 2 +- >> arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi | 2 +- >> arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts | 2 +- >> arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 2 +- >> arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi | 2 +- >> arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 2 +- > > Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> > > sunxi DT changes are already closed for 6.5. I can take it after -rc1 for 6.6. Hmmmm and what is the status of taking it after rc1? Best regards, Krzysztof
Dne sreda, 23. avgust 2023 ob 10:52:38 CEST je Krzysztof Kozlowski napisal(a): > 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. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Applied, thanks! Best regards, Jernej > > --- > > Rebased on next-20230822, so might not apply cleanly. What does not > apply, can be skipped and I will fix it after next RC. > --- > arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts | 2 +- > .../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts | 2 +- > .../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts | 2 +- > arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 2 +- > arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi | 2 +- > arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 2 +- > 14 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi > index 9b03fca2444c..ed7b12e65a10 100644 > --- a/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi > +++ b/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org> > > / { > diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts > index 8785de3c9224..3a2c3281eb88 100644 > --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts > +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> > > #include <dt-bindings/gpio/gpio.h> > diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts > index 4df8ffb71561..711450ffb602 100644 > --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts > +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> > > #include "sun20i-d1-lichee-rv-86-panel.dtsi" > diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts > index 1874fc05359f..b217799e6166 100644 > --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts > +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> > > #include "sun20i-d1-lichee-rv-86-panel.dtsi" > diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi > index 6cc7dd0c1ae2..10116fb3935a 100644 > --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi > +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> > > #include "sun20i-d1-lichee-rv.dts" > diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts > index 52b91e1affed..08cf716328a0 100644 > --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts > +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > // Copyright (C) 2022 Jisheng Zhang <jszhang@kernel.org> > // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> > > diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts > index d60a0562a8b1..204da82a5dc6 100644 > --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts > +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > // Copyright (C) 2022 Jisheng Zhang <jszhang@kernel.org> > // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> > > diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts > index f2e07043afb3..e2bb6bc16c13 100644 > --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts > +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> > > #include <dt-bindings/gpio/gpio.h> > diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts > index 4ed33c1e7c9c..8dbe717c79ce 100644 > --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts > +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org> > > /* > diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi > index 97e7cbb32597..b18f368e06e0 100644 > --- a/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi > +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org> > > #include "sun20i-d1s.dtsi" > diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts > index e6d924f671fd..1a7d6ef33f17 100644 > --- a/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts > +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> > > #include <dt-bindings/gpio/gpio.h> > diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi > index 8275630af977..450387265469 100644 > --- a/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi > +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org> > > #define SOC_PERIPHERAL_IRQ(nr) (nr + 16) > diff --git a/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi b/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi > index b7156123df54..3b077dc086ab 100644 > --- a/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi > +++ b/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org> > > / { > diff --git a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi > index 822f022eec2d..5a9d7f5a75b4 100644 > --- a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi > +++ b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org> > > #include <dt-bindings/clock/sun6i-rtc.h> >
diff --git a/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi index 9b03fca2444c..ed7b12e65a10 100644 --- a/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi +++ b/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org> / { diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts index 8785de3c9224..3a2c3281eb88 100644 --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> #include <dt-bindings/gpio/gpio.h> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts index 4df8ffb71561..711450ffb602 100644 --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> #include "sun20i-d1-lichee-rv-86-panel.dtsi" diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts index 1874fc05359f..b217799e6166 100644 --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> #include "sun20i-d1-lichee-rv-86-panel.dtsi" diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi index 6cc7dd0c1ae2..10116fb3935a 100644 --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> #include "sun20i-d1-lichee-rv.dts" diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts index 52b91e1affed..08cf716328a0 100644 --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2022 Jisheng Zhang <jszhang@kernel.org> // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts index d60a0562a8b1..204da82a5dc6 100644 --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2022 Jisheng Zhang <jszhang@kernel.org> // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts index f2e07043afb3..e2bb6bc16c13 100644 --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> #include <dt-bindings/gpio/gpio.h> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts index 4ed33c1e7c9c..8dbe717c79ce 100644 --- a/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org> /* diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi index 97e7cbb32597..b18f368e06e0 100644 --- a/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org> #include "sun20i-d1s.dtsi" diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts b/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts index e6d924f671fd..1a7d6ef33f17 100644 --- a/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2022 Samuel Holland <samuel@sholland.org> #include <dt-bindings/gpio/gpio.h> diff --git a/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi index 8275630af977..450387265469 100644 --- a/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi +++ b/arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org> #define SOC_PERIPHERAL_IRQ(nr) (nr + 16) diff --git a/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi b/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi index b7156123df54..3b077dc086ab 100644 --- a/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi +++ b/arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org> / { diff --git a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi index 822f022eec2d..5a9d7f5a75b4 100644 --- a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi +++ b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org> #include <dt-bindings/clock/sun6i-rtc.h>
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. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- Rebased on next-20230822, so might not apply cleanly. What does not apply, can be skipped and I will fix it after next RC. --- arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi | 2 +- arch/riscv/boot/dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts | 2 +- .../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-480p.dts | 2 +- .../boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel-720p.dts | 2 +- arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-86-panel.dtsi | 2 +- arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv-dock.dts | 2 +- arch/riscv/boot/dts/allwinner/sun20i-d1-lichee-rv.dts | 2 +- arch/riscv/boot/dts/allwinner/sun20i-d1-mangopi-mq-pro.dts | 2 +- arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts | 2 +- arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi | 2 +- arch/riscv/boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts | 2 +- arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 2 +- arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi | 2 +- arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-)