From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44B26CE7A8A for ; Sun, 24 Sep 2023 19:53:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231416AbjIXTxe (ORCPT ); Sun, 24 Sep 2023 15:53:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230399AbjIXTxd (ORCPT ); Sun, 24 Sep 2023 15:53:33 -0400 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B6E7D3; Sun, 24 Sep 2023 12:53:26 -0700 (PDT) Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2b9d07a8d84so83242841fa.3; Sun, 24 Sep 2023 12:53:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695585204; x=1696190004; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v0d3YVvRT9dZksB7Z0EZhHU3PKUHlJOKGLc8dKpN2qA=; b=CIfMThZQrvD6xkWGT9YzPYILRYcDZmZjvH5WkTTt12WgvfIb0sQwOB8tMT1y2cSVul mzDvxNagDUvrPvE6gEqpquR3AQxAy1MXJbXI/RMDnHSm10K4hTVVu1lAo1z9/i+rs4am SxyWhk2ZSTBtKx6ArD8juH1a8FqDUIaK4SXu8qtf53HG4tDxyVZplfYvqid9PQ0fZyQD Pwo46HwgeazigcYAQJN7kRvjOkCElVQ3RwvTWEgPhC5gW3xTD4zSGCJkszO9gKGywNm9 6Ce4aXrMlhRcizAMKk0sLyP1scZbmPZeRCf18HnRAURYkPYPoX5nzkXDyEikrugSCHa0 +g+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695585204; x=1696190004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v0d3YVvRT9dZksB7Z0EZhHU3PKUHlJOKGLc8dKpN2qA=; b=Y29AxqUPdbHrdqP3nCwZHHUE/pCdQNc44xP3uSFx3MPmYncz4p6/4qB2/P0HPGjX4b 9LlV+mIoj+/AYYBVT43rKQy9/b20iz18yPOw9nVEKSIS3ekdGLbqV/kRG7FSAAsjx7F3 KjXj+HE4/icMUMvWXwKHyDK54l/KNLanzEBQineoozBcH4y83rq8Er5Tmu11YSPnUc2V wxOXUu22JIvbYBoViwguDp0IJaDHm+3aWAH+Ka/XaD+4950xHIjLGHF8GoXW4kCCLDJ1 QVM7qEdVkYZssUY8u90B1PvuSz7Umfl+lXZqdQ6nPgVRlMyrRf4VJ0Fs45fYLZObvXbc kJsw== X-Gm-Message-State: AOJu0Yx9se9MFta+Be9JTYw+aojFwdsdNElE0OVTw0RHTOn6IA8xliFk /imxEpWAeT/A+W/NTf7Va5I= X-Google-Smtp-Source: AGHT+IGS18qcaUt/JSWnUE5QJPAZC0mw8nPR6JoiV75sIqS6/y3U/VEFHkRsM7E5MB6Xlp/hfv86mQ== X-Received: by 2002:a2e:994a:0:b0:2ba:34d0:fa5f with SMTP id r10-20020a2e994a000000b002ba34d0fa5fmr3887452ljj.37.1695585203989; Sun, 24 Sep 2023 12:53:23 -0700 (PDT) Received: from jernej-laptop.localnet (82-149-12-148.dynamic.telemach.net. [82.149.12.148]) by smtp.gmail.com with ESMTPSA id ce21-20020a170906b25500b009ad850d4760sm5285822ejb.219.2023.09.24.12.53.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 12:53:23 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Paul Walmsley , Palmer Dabbelt , Albert Ou , Chen-Yu Tsai , Samuel Holland , devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Krzysztof Kozlowski Cc: Krzysztof Kozlowski Subject: Re: [PATCH] riscv: dts: use capital "OR" for multiple licenses in SPDX Date: Sun, 24 Sep 2023 21:53:22 +0200 Message-ID: <3256759.44csPzL39Z@jernej-laptop> In-Reply-To: <20230823085238.113642-1-krzysztof.kozlowski@linaro.org> References: <20230823085238.113642-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 > > / { > 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 > > #include > 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 > > #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 > > #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 > > #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 > // Copyright (C) 2022 Samuel Holland > > 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 > // Copyright (C) 2022 Samuel Holland > > 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 > > #include > 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 > > /* > 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 > > #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 > > #include > 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 > > #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 > > / { > 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 > > #include >