All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Shawn Guo <shawnguo@kernel.org>
Cc: Fabio Estevam <fabio.estevam@nxp.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>,
	Bill Pringlemeir <bpringlemeir@nbsps.com>,
	Chao Fu <b44548@freescale.com>,
	Chircu Bogdan <Bogdan.Chircu@freescale.com>,
	Cory Tusar <cory.tusar@pid1solutions.com>,
	Cosmin Stoica <cosminstefan.stoica@freescale.com>,
	Eddy Petrisor <eddy.petrisor@freescale.com>,
	Fugang Duan <B38611@freescale.com>,
	Jingchang Lu <b35083@freescale.com>,
	Stefan Agner <stefan@agner.ch>, Xiubo Li <Li.Xiubo@freescale.com>
Subject: [PATCH 35/37] ARM: dts: vf610-twr: Correct license text
Date: Thu, 15 Dec 2016 00:57:44 +0100	[thread overview]
Message-ID: <20161214235746.7108-36-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <20161214235746.7108-1-alexandre.belloni@free-electrons.com>

The license test has been mangled at some point then copy pasted across
multiple files. Restore it to what it should be.
Note that this is not intended as a license change.

Cc: Bill Pringlemeir <bpringlemeir@nbsps.com>
Cc: Chao Fu <b44548@freescale.com>
Cc: Chircu Bogdan <Bogdan.Chircu@freescale.com>
Cc: Cory Tusar <cory.tusar@pid1solutions.com>
Cc: Cosmin Stoica <cosminstefan.stoica@freescale.com>
Cc: Eddy Petrisor <eddy.petrisor@freescale.com>
Cc: Fugang Duan <B38611@freescale.com>
Cc: Jingchang Lu <b35083@freescale.com>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/boot/dts/vf610-twr.dts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index cdc100732514..53e3b8b250c6 100644
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -10,17 +10,17 @@
  *     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
+ *     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
+ * 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
+ *     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
@@ -29,11 +29,11 @@
  *     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 SOFTWARE IS PROVIDED "AS IS", 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
+ *     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.
-- 
2.10.2

WARNING: multiple messages have this Message-ID (diff)
From: alexandre.belloni@free-electrons.com (Alexandre Belloni)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 35/37] ARM: dts: vf610-twr: Correct license text
Date: Thu, 15 Dec 2016 00:57:44 +0100	[thread overview]
Message-ID: <20161214235746.7108-36-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <20161214235746.7108-1-alexandre.belloni@free-electrons.com>

The license test has been mangled at some point then copy pasted across
multiple files. Restore it to what it should be.
Note that this is not intended as a license change.

Cc: Bill Pringlemeir <bpringlemeir@nbsps.com>
Cc: Chao Fu <b44548@freescale.com>
Cc: Chircu Bogdan <Bogdan.Chircu@freescale.com>
Cc: Cory Tusar <cory.tusar@pid1solutions.com>
Cc: Cosmin Stoica <cosminstefan.stoica@freescale.com>
Cc: Eddy Petrisor <eddy.petrisor@freescale.com>
Cc: Fugang Duan <B38611@freescale.com>
Cc: Jingchang Lu <b35083@freescale.com>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 arch/arm/boot/dts/vf610-twr.dts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index cdc100732514..53e3b8b250c6 100644
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -10,17 +10,17 @@
  *     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
+ *     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
+ * 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
+ *     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
@@ -29,11 +29,11 @@
  *     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 SOFTWARE IS PROVIDED "AS IS", 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
+ *     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.
-- 
2.10.2

  parent reply	other threads:[~2016-12-14 23:58 UTC|newest]

Thread overview: 94+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20161214235746.7108-1-alexandre.belloni@free-electrons.com>
2016-12-14 23:57 ` [PATCH 01/37] ARM: dts: imx6dl-aristainetos2: Correct license text Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-15  5:29   ` Heiko Schocher
2016-12-15  5:29     ` Heiko Schocher
2016-12-15 17:27   ` Rask Ingemann Lambertsen
2016-12-15 17:27     ` Rask Ingemann Lambertsen
2016-12-14 23:57 ` [PATCH 02/37] ARM: dts: imx6*-cubox-i: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 03/37] ARM: dts: imx6*-hummingboard: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 04/37] ARM: dts: imx6dl-nit6xlite: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 05/37] ARM: dts: imx6*-nitrogen6x: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 06/37] ARM: dts: imx6dl-sabrelite: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 07/37] ARM: dts: imx6dl-ts4900: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 08/37] ARM: dts: imx6q-apalis-ixora: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-15  7:49   ` Marcel Ziswiler
2016-12-15  7:49     ` Marcel Ziswiler
2016-12-14 23:57 ` [PATCH 09/37] ARM: dts: imx6q-b450v3: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 10/37] ARM: dts: imx6q-b650v3: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 11/37] ARM: dts: imx6q-b850v3: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 12/37] ARM: dts: imx6q-ba16: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 13/37] ARM: dts: imx6q-bx50v3: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 14/37] ARM: dts: imx6q-cm-fx6: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 15/37] ARM: dts: imx6qdl-apalis: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-15  7:49   ` Marcel Ziswiler
2016-12-15  7:49     ` Marcel Ziswiler
2016-12-14 23:57 ` [PATCH 16/37] ARM: dts: imx6qdl-icore-rqs: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2017-01-02  8:21   ` Michael Trimarchi
2017-01-02  8:21     ` Michael Trimarchi
2016-12-14 23:57 ` [PATCH 17/37] ARM: dts: imx6*-microsom: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 18/37] ARM: dts: imx6qdl-nit6xlite: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 19/37] ARM: dts: imx6*-nitrogen6_max: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 20/37] ARM: dts: imx6*-sabrelite: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-15  8:01   ` Uwe Kleine-König
2016-12-15  8:01     ` Uwe Kleine-König
2016-12-14 23:57 ` [PATCH 21/37] ARM: dts: imx6qdl-ts4900: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 22/37] ARM: dts: imx6q-h100: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 23/37] ARM: dts: imx6q-icore-rqs: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2017-01-02  8:22   ` Michael Trimarchi
2017-01-02  8:22     ` Michael Trimarchi
2016-12-14 23:57 ` [PATCH 24/37] ARM: dts: imx6q-marsboard: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 25/37] ARM: dts: imx6q-ts4900: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 26/37] ARM: dts: imx6sx-nitrogen6sx: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 27/37] ARM: dts: imx6sx-sdb-sai: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 28/37] ARM: dts: imx6ul-geam: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2017-01-02  8:23   ` Michael Trimarchi
2017-01-02  8:23     ` Michael Trimarchi
2016-12-14 23:57 ` [PATCH 29/37] ARM: dts: imx6ul-pico-hobbit: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 30/37] ARM: dts: vf*-colibri: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2017-01-02 16:51   ` Stefan Agner
2017-01-02 16:51     ` Stefan Agner
2016-12-14 23:57 ` [PATCH 31/37] ARM: dts: vf500: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 32/37] ARM: dts: vf610: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 33/37] ARM: dts: vf610m4-cosmic: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-15 13:24   ` Afzal Mohammed
2016-12-15 13:24     ` Afzal Mohammed
2016-12-14 23:57 ` [PATCH 34/37] ARM: dts: vf610m4: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` Alexandre Belloni [this message]
2016-12-14 23:57   ` [PATCH 35/37] ARM: dts: vf610-twr: " Alexandre Belloni
2016-12-14 23:57 ` [PATCH 36/37] ARM: dts: vf610-zii-dev-rev-b: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni
2016-12-14 23:57 ` [PATCH 37/37] ARM: dts: vfxxx: " Alexandre Belloni
2016-12-14 23:57   ` Alexandre Belloni

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=20161214235746.7108-36-alexandre.belloni@free-electrons.com \
    --to=alexandre.belloni@free-electrons.com \
    --cc=B38611@freescale.com \
    --cc=Bogdan.Chircu@freescale.com \
    --cc=Li.Xiubo@freescale.com \
    --cc=b35083@freescale.com \
    --cc=b44548@freescale.com \
    --cc=bpringlemeir@nbsps.com \
    --cc=cory.tusar@pid1solutions.com \
    --cc=cosminstefan.stoica@freescale.com \
    --cc=eddy.petrisor@freescale.com \
    --cc=fabio.estevam@nxp.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=shawnguo@kernel.org \
    --cc=stefan@agner.ch \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.