Hi Thierry,
Thanks for pointing that out,
Already fixed and sent v3
On Wed, Apr 17, 2019 at 10:55 AM Thierry Reding
<thierry.reding@xxxxxxxxx> wrote:
>
> On Wed, Apr 17, 2019 at 08:13:51AM +0200, Marcel Ziswiler wrote:
> > +// SPDX-License-Identifier: (GPL-2.0 OR X11)
> >
> > I believe the parentheses don't really server any purpose here. With that:
> >
> > Acked-by: Marcel Ziswiler <marcel.ziswiler@xxxxxxxxxxx>
> >
> > On April 10, 2019 9:10:07 AM GMT+02:00, Igor Opaniuk <igor.opaniuk@xxxxxxxxxxx> wrote:
> > >Replace boiler plate licenses texts with the SPDX license
> > >identifiers in Colibri/Apalis DTS files.
> > >
> > >Signed-off-by: Igor Opaniuk <igor.opaniuk@xxxxxxxxxxx>
> > >---
> > > arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 39 ++-------------------
> > > arch/arm/boot/dts/tegra124-apalis-eval.dts | 40 ++--------------------
> > > arch/arm/boot/dts/tegra124-apalis.dtsi | 40 ++--------------------
> > > 3 files changed, 6 insertions(+), 113 deletions(-)
> > >
> > >diff --git a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> > >b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> > >index ca2c3a557895..36211f876e33 100644
> > >--- a/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> > >+++ b/arch/arm/boot/dts/tegra124-apalis-emc.dtsi
> > >@@ -1,42 +1,7 @@
> > >+// SPDX-License-Identifier: GPL-2.0 OR MIT
>
> The old text below says that this was supposed to be GPL-2.0 OR X11. Do
> you want me to fix that while applying?
>
> Thierry
>
> > > /*
> > >- * Copyright 2016 Toradex AG
> > >+ * Copyright 2016-2019 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 eaee10ef6512..e2388368d635 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.
> > >+ * Copyright 2016-2019 Toradex AG
> > > */
> > >
> > > /dts-v1/;
> > >diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi
> > >b/arch/arm/boot/dts/tegra124-apalis.dtsi
> > >index 13c93cd507d8..690f881ea9cb 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.
> > >+ * Copyright 2016-2019 Toradex AG
> > > */
> > >
> > > #include "tegra124.dtsi"
> > >--
> > >2.17.1
> >
> > --
> > Sent from my Android device with K-9 Mail. Please excuse my brevity.
--
Best regards - Freundliche Grüsse - Meilleures salutations
Senior Development Engineer,
Igor Opaniuk
Toradex AG
Altsagenstrasse 5 | 6048 Horw/Luzern | Switzerland | T: +41 41 500 48
00 (main line)
