Fix incorrect format used for OR clause in SPDX license identifier.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 2 +-
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
index 8a8d5fa0ecd1..e2c0d8efb358 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright 2016-2018 Toradex AG
*/
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index 573aaa50fff1..5ef84b6b3356 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright 2016-2018 Toradex AG
*/
--
2.14.1
Three files dual-licensed were missing the SPDX license identifiers.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 38 +-----------------------------
arch/arm/boot/dts/tegra124-apalis-eval.dts | 38 +-----------------------------
arch/arm/boot/dts/tegra124-apalis.dtsi | 38 +-----------------------------
3 files changed, 3 insertions(+), 111 deletions(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
index ca2c3a557895..cdbbb3562fb9 100644
--- a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
@@ -1,42 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0 OR X11
/*
* Copyright 2016 Toradex AG
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- * a) This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This file is distributed in the hope that it will be useful
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * Or, alternatively
- *
- * b) Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
*/
/ {
diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts
index a6ad759dddb4..1c70c0078d75 100644
--- a/arch/arm/boot/dts/tegra124-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts
@@ -1,42 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0 OR X11
/*
* Copyright 2016-2018 Toradex AG
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- * a) This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This file is distributed in the hope that it will be useful
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * Or, alternatively
- *
- * b) Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 0f0d4a4988b9..14e9a204b84a 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -1,42 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0 OR X11
/*
* Copyright 2016-2018 Toradex AG
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- * a) This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This file is distributed in the hope that it will be useful
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * Or, alternatively
- *
- * b) Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
*/
#include "tegra124.dtsi"
--
2.14.1
Fix indentation and alignment when spaces were used instead of tabs.
This fixes checkpatch errors like:
ERROR: code indent should use tabs where possible
#306: FILE: arch/arm/boot/dts/tegra20-paz00.dts:306:
+^I^I <&tegra_car TEGRA20_CLK_PLL_P_OUT3>;$
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/boot/dts/tegra20-colibri.dtsi | 2 +-
arch/arm/boot/dts/tegra20-paz00.dts | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/tegra20-colibri.dtsi b/arch/arm/boot/dts/tegra20-colibri.dtsi
index e7b9ab09908a..fa1af2dc276c 100644
--- a/arch/arm/boot/dts/tegra20-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri.dtsi
@@ -541,7 +541,7 @@
sound {
compatible = "nvidia,tegra-audio-wm9712-colibri_t20",
- "nvidia,tegra-audio-wm9712";
+ "nvidia,tegra-audio-wm9712";
nvidia,model = "Colibri T20 AC97 Audio";
nvidia,audio-routing =
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index ef245291924f..7d8aef6ebd3a 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -303,7 +303,7 @@
request-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
slave-addr = <138>;
clocks = <&tegra_car TEGRA20_CLK_I2C3>,
- <&tegra_car TEGRA20_CLK_PLL_P_OUT3>;
+ <&tegra_car TEGRA20_CLK_PLL_P_OUT3>;
clock-names = "div-clk", "fast-clk";
resets = <&tegra_car 67>;
reset-names = "i2c";
@@ -599,8 +599,8 @@
GPIO_ACTIVE_HIGH>;
clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
- <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
- <&tegra_car TEGRA20_CLK_CDEV1>;
+ <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
+ <&tegra_car TEGRA20_CLK_CDEV1>;
clock-names = "pll_a", "pll_a_out0", "mclk";
};
};
--
2.14.1
On Wed, 2018-07-18 at 21:48 +0200, Krzysztof Kozlowski wrote:
> Fix incorrect format used for OR clause in SPDX license identifier.
Can you please elaborate how you got to that conclusion as there are
various other device trees having it specified the exact same way. Plus
I was actually even in discussion with Philippe on that patch set back
when I introduced those.
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 2 +-
> arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
> b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
> index 8a8d5fa0ecd1..e2c0d8efb358 100644
> --- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
> +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0 OR MIT)
> +// SPDX-License-Identifier: GPL-2.0 OR MIT
> /*
> * Copyright 2016-2018 Toradex AG
> */
> diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> index 573aaa50fff1..5ef84b6b3356 100644
> --- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0 OR MIT)
> +// SPDX-License-Identifier: GPL-2.0 OR MIT
> /*
> * Copyright 2016-2018 Toradex AG
> */
[1] https://lore.kernel.org/lkml/C651C677-D157-41A3-B206-CB02B986AD19@z
iswiler.com/
On Wed, 2018-07-18 at 21:48 +0200, Krzysztof Kozlowski wrote:
> Fix indentation and alignment when spaces were used instead of tabs.
> This fixes checkpatch errors like:
>
> ERROR: code indent should use tabs where possible
> #306: FILE: arch/arm/boot/dts/tegra20-paz00.dts:306:
> +^I^I <&tegra_car TEGRA20_CLK_PLL_P_OUT3>;$
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
Acked-by: Marcel Ziswiler <[email protected]>
> ---
> arch/arm/boot/dts/tegra20-colibri.dtsi | 2 +-
> arch/arm/boot/dts/tegra20-paz00.dts | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/tegra20-colibri.dtsi
> b/arch/arm/boot/dts/tegra20-colibri.dtsi
> index e7b9ab09908a..fa1af2dc276c 100644
> --- a/arch/arm/boot/dts/tegra20-colibri.dtsi
> +++ b/arch/arm/boot/dts/tegra20-colibri.dtsi
> @@ -541,7 +541,7 @@
>
> sound {
> compatible = "nvidia,tegra-audio-wm9712-
> colibri_t20",
> - "nvidia,tegra-audio-wm9712";
> + "nvidia,tegra-audio-wm9712";
> nvidia,model = "Colibri T20 AC97 Audio";
>
> nvidia,audio-routing =
> diff --git a/arch/arm/boot/dts/tegra20-paz00.dts
> b/arch/arm/boot/dts/tegra20-paz00.dts
> index ef245291924f..7d8aef6ebd3a 100644
> --- a/arch/arm/boot/dts/tegra20-paz00.dts
> +++ b/arch/arm/boot/dts/tegra20-paz00.dts
> @@ -303,7 +303,7 @@
> request-gpios = <&gpio TEGRA_GPIO(V, 2)
> GPIO_ACTIVE_HIGH>;
> slave-addr = <138>;
> clocks = <&tegra_car TEGRA20_CLK_I2C3>,
> - <&tegra_car TEGRA20_CLK_PLL_P_OUT3>;
> + <&tegra_car TEGRA20_CLK_PLL_P_OUT3>;
> clock-names = "div-clk", "fast-clk";
> resets = <&tegra_car 67>;
> reset-names = "i2c";
> @@ -599,8 +599,8 @@
> GPIO_ACTIVE_HIGH>;
>
> clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
> - <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
> - <&tegra_car TEGRA20_CLK_CDEV1>;
> + <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
> + <&tegra_car TEGRA20_CLK_CDEV1>;
> clock-names = "pll_a", "pll_a_out0", "mclk";
> };
> };
BTW: I am anyway in the process of sending out a major revamp of all our device trees targeting the Tegras and likewise made sure they do pass checkpatch (;-p).
On Wed, 2018-07-18 at 21:48 +0200, Krzysztof Kozlowski wrote:
> Three files dual-licensed were missing the SPDX license identifiers.
As mentioned before [1] I am in the process of preparing a patch set
which cleans that up across all Toradex device trees. Our plan is to
actually move them all to dual GPL-2.0/MIT.
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 38 +-------------------
> ----------
> arch/arm/boot/dts/tegra124-apalis-eval.dts | 38 +-------------------
> ----------
> arch/arm/boot/dts/tegra124-apalis.dtsi | 38 +-------------------
> ----------
> 3 files changed, 3 insertions(+), 111 deletions(-)
>
> diff --git a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> index ca2c3a557895..cdbbb3562fb9 100644
> --- a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> +++ b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> @@ -1,42 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0 OR X11
> /*
> * Copyright 2016 Toradex AG
> - *
> - * This file is dual-licensed: you can use it either under the terms
> - * of the GPL or the X11 license, at your option. Note that this
> dual
> - * licensing only applies to this file, and not this project as a
> - * whole.
> - *
> - * a) This file is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License
> - * version 2 as published by the Free Software Foundation.
> - *
> - * This file is distributed in the hope that it will be useful
> - * but WITHOUT ANY WARRANTY; without even the implied warranty
> of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU General Public License for more details.
> - *
> - * Or, alternatively
> - *
> - * b) Permission is hereby granted, free of charge, to any person
> - * obtaining a copy of this software and associated
> documentation
> - * files (the "Software"), to deal in the Software without
> - * restriction, including without limitation the rights to use
> - * copy, modify, merge, publish, distribute, sublicense, and/or
> - * sell copies of the Software, and to permit persons to whom
> the
> - * Software is furnished to do so, subject to the following
> - * conditions:
> - *
> - * The above copyright notice and this permission notice shall
> be
> - * included in all copies or substantial portions of the
> Software.
> - *
> - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
> WARRANTIES
> - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> - * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> / {
> diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts
> b/arch/arm/boot/dts/tegra124-apalis-eval.dts
> index a6ad759dddb4..1c70c0078d75 100644
> --- a/arch/arm/boot/dts/tegra124-apalis-eval.dts
> +++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts
> @@ -1,42 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0 OR X11
> /*
> * Copyright 2016-2018 Toradex AG
> - *
> - * This file is dual-licensed: you can use it either under the terms
> - * of the GPL or the X11 license, at your option. Note that this
> dual
> - * licensing only applies to this file, and not this project as a
> - * whole.
> - *
> - * a) This file is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License
> - * version 2 as published by the Free Software Foundation.
> - *
> - * This file is distributed in the hope that it will be useful
> - * but WITHOUT ANY WARRANTY; without even the implied warranty
> of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU General Public License for more details.
> - *
> - * Or, alternatively
> - *
> - * b) Permission is hereby granted, free of charge, to any person
> - * obtaining a copy of this software and associated
> documentation
> - * files (the "Software"), to deal in the Software without
> - * restriction, including without limitation the rights to use
> - * copy, modify, merge, publish, distribute, sublicense, and/or
> - * sell copies of the Software, and to permit persons to whom
> the
> - * Software is furnished to do so, subject to the following
> - * conditions:
> - *
> - * The above copyright notice and this permission notice shall
> be
> - * included in all copies or substantial portions of the
> Software.
> - *
> - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
> WARRANTIES
> - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> - * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi
> b/arch/arm/boot/dts/tegra124-apalis.dtsi
> index 0f0d4a4988b9..14e9a204b84a 100644
> --- a/arch/arm/boot/dts/tegra124-apalis.dtsi
> +++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
> @@ -1,42 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0 OR X11
> /*
> * Copyright 2016-2018 Toradex AG
> - *
> - * This file is dual-licensed: you can use it either under the terms
> - * of the GPL or the X11 license, at your option. Note that this
> dual
> - * licensing only applies to this file, and not this project as a
> - * whole.
> - *
> - * a) This file is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License
> - * version 2 as published by the Free Software Foundation.
> - *
> - * This file is distributed in the hope that it will be useful
> - * but WITHOUT ANY WARRANTY; without even the implied warranty
> of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU General Public License for more details.
> - *
> - * Or, alternatively
> - *
> - * b) Permission is hereby granted, free of charge, to any person
> - * obtaining a copy of this software and associated
> documentation
> - * files (the "Software"), to deal in the Software without
> - * restriction, including without limitation the rights to use
> - * copy, modify, merge, publish, distribute, sublicense, and/or
> - * sell copies of the Software, and to permit persons to whom
> the
> - * Software is furnished to do so, subject to the following
> - * conditions:
> - *
> - * The above copyright notice and this permission notice shall
> be
> - * included in all copies or substantial portions of the
> Software.
> - *
> - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
> WARRANTIES
> - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> - * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> #include "tegra124.dtsi"
[1] https://lore.kernel.org/lkml/[email protected]/
On Wed, 2018-07-18 at 21:48 +0200, Krzysztof Kozlowski wrote:
> Fix incorrect format used for OR clause in SPDX license identifier.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 2 +-
> arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
> b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
> index 8a8d5fa0ecd1..e2c0d8efb358 100644
> --- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
> +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0 OR MIT)
At least the SPDX wiki suggests our exact used notation with brackets
(OK, lower case or but I guess that now really does not matter (;-p).
> +// SPDX-License-Identifier: GPL-2.0 OR MIT
> /*
> * Copyright 2016-2018 Toradex AG
> */
> diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> index 573aaa50fff1..5ef84b6b3356 100644
> --- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: (GPL-2.0 OR MIT)
> +// SPDX-License-Identifier: GPL-2.0 OR MIT
> /*
> * Copyright 2016-2018 Toradex AG
> */
[1] https://wiki.spdx.org/view/SPDX_FAQ
On 18 July 2018 at 22:37, Marcel Ziswiler <[email protected]> wrote:
> On Wed, 2018-07-18 at 21:48 +0200, Krzysztof Kozlowski wrote:
>> Fix incorrect format used for OR clause in SPDX license identifier.
>
> Can you please elaborate how you got to that conclusion as there are
> various other device trees having it specified the exact same way. Plus
> I was actually even in discussion with Philippe on that patch set back
> when I introduced those.
Hi,
I thought these were pointed by checkpatch but it was my mistake -
checkpatch complained about missing SPDX in tegra124-apalis.dtsi, not
about these files. Maybe I was mislead by the in-kernel example [1]...
although SPDX specification uses them so I think this patch can be
abandoned.
[1] https://elixir.bootlin.com/linux/v4.18-rc5/source/Documentation/process/license-rules.rst#L130
Best regards,
Krzysztof
Hi Krzysztof,
On Wed, Jul 18, 2018 at 9:48 PM, Krzysztof Kozlowski <[email protected]> wrote:
> Three files dual-licensed were missing the SPDX license identifiers.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 38 +-----------------------------
> arch/arm/boot/dts/tegra124-apalis-eval.dts | 38 +-----------------------------
> arch/arm/boot/dts/tegra124-apalis.dtsi | 38 +-----------------------------
> 3 files changed, 3 insertions(+), 111 deletions(-)
>
> diff --git a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> index ca2c3a557895..cdbbb3562fb9 100644
> --- a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> +++ b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> @@ -1,42 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0 OR X11
> /*
> * Copyright 2016 Toradex AG
> - *
> - * This file is dual-licensed: you can use it either under the terms
> - * of the GPL or the X11 license, at your option. Note that this dual
> - * licensing only applies to this file, and not this project as a
> - * whole.
This is weirdly enough not what is called an X11 license [1] even
though it is named this way here... but this is an MIT license [2]
with a small variation. (See below)
> - *
> - * a) This file is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License
> - * version 2 as published by the Free Software Foundation.
> - *
> - * This file is distributed in the hope that it will be useful
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU General Public License for more details.
> - *
> - * Or, alternatively
> - *
> - * b) Permission is hereby granted, free of charge, to any person
> - * obtaining a copy of this software and associated documentation
> - * files (the "Software"), to deal in the Software without
> - * restriction, including without limitation the rights to use
> - * copy, modify, merge, publish, distribute, sublicense, and/or
> - * sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following
> - * conditions:
> - *
> - * The above copyright notice and this permission notice shall be
> - * included in all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
The MIT standard text [2] has a few extra commas and states instead:
THE SOFTWARE IS PROVIDED "AS IS",
Here "AS IS" is omitted. I am not sure this is material but IMHO it
would be good to get Toradex signoff on this.
> - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> - * OTHER DEALINGS IN THE SOFTWARE.
> */
<snip>
With all this said, I think that your expression should be this
instead (and this applies to other places too):
SPDX-License-Identifier: GPL-2.0 OR MIT
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/LICENSES/other/X11?h=v4.18-rc5
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/LICENSES/preferred/MIT?h=v4.18-rc5
--
Cordially
Philippe Ombredanne
On 19 July 2018 at 18:44, Philippe Ombredanne <[email protected]> wrote:
> Hi Krzysztof,
>
> On Wed, Jul 18, 2018 at 9:48 PM, Krzysztof Kozlowski <[email protected]> wrote:
>> Three files dual-licensed were missing the SPDX license identifiers.
>>
>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>> ---
>> arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 38 +-----------------------------
>> arch/arm/boot/dts/tegra124-apalis-eval.dts | 38 +-----------------------------
>> arch/arm/boot/dts/tegra124-apalis.dtsi | 38 +-----------------------------
>> 3 files changed, 3 insertions(+), 111 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
>> index ca2c3a557895..cdbbb3562fb9 100644
>> --- a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
>> +++ b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
>> @@ -1,42 +1,6 @@
>> +// SPDX-License-Identifier: GPL-2.0 OR X11
>> /*
>> * Copyright 2016 Toradex AG
>> - *
>> - * This file is dual-licensed: you can use it either under the terms
>> - * of the GPL or the X11 license, at your option. Note that this dual
>> - * licensing only applies to this file, and not this project as a
>> - * whole.
>
> This is weirdly enough not what is called an X11 license [1] even
> though it is named this way here... but this is an MIT license [2]
> with a small variation. (See below)
Indeed... I checked the text just briefly and in 90% these licenses
are the same.
>> - *
>> - * a) This file is free software; you can redistribute it and/or
>> - * modify it under the terms of the GNU General Public License
>> - * version 2 as published by the Free Software Foundation.
>> - *
>> - * This file is distributed in the hope that it will be useful
>> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> - * GNU General Public License for more details.
>> - *
>> - * Or, alternatively
>> - *
>> - * b) Permission is hereby granted, free of charge, to any person
>> - * obtaining a copy of this software and associated documentation
>> - * files (the "Software"), to deal in the Software without
>> - * restriction, including without limitation the rights to use
>> - * copy, modify, merge, publish, distribute, sublicense, and/or
>> - * sell copies of the Software, and to permit persons to whom the
>> - * Software is furnished to do so, subject to the following
>> - * conditions:
>> - *
>> - * The above copyright notice and this permission notice shall be
>> - * included in all copies or substantial portions of the Software.
>> - *
>> - * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
>
> The MIT standard text [2] has a few extra commas and states instead:
>
> THE SOFTWARE IS PROVIDED "AS IS",
>
> Here "AS IS" is omitted. I am not sure this is material but IMHO it
> would be good to get Toradex signoff on this.
>
>> - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
>> - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
>> - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
>> - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
>> - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
>> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
>> - * OTHER DEALINGS IN THE SOFTWARE.
>> */
>
> <snip>
>
>
> With all this said, I think that your expression should be this
> instead (and this applies to other places too):
>
> SPDX-License-Identifier: GPL-2.0 OR MIT
Right, Marcel from Toradex already replied that he tries to switch to
MIT license. Since this is already MIT-like license then maybe
relicensing will not be needed and could be done fast (e.g. without
signs of all involved people).
In such case let's skip this patch.
Best regards,
Krzysztof