Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757028AbcLORYs (ORCPT ); Thu, 15 Dec 2016 12:24:48 -0500 Received: from mail-db5eur01on0127.outbound.protection.outlook.com ([104.47.2.127]:10752 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756821AbcLORY3 (ORCPT ); Thu, 15 Dec 2016 12:24:29 -0500 X-Greylist: delayed 32438 seconds by postgrey-1.27 at vger.kernel.org; Thu, 15 Dec 2016 12:24:29 EST From: Marcel Ziswiler To: "alexandre.belloni@free-electrons.com" , "shawnguo@kernel.org" CC: "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "l.stach@pengutronix.de" , "fabio.estevam@nxp.com" , "bhelgaas@google.com" , "ynezz@true.cz" , "jbe@pengutronix.de" Subject: Re: [PATCH 08/37] ARM: dts: imx6q-apalis-ixora: Correct license text Thread-Topic: [PATCH 08/37] ARM: dts: imx6q-apalis-ixora: Correct license text Thread-Index: AQHSVmXspZYetQ2mW0m0nqB0Qj9rZ6EIoroA Date: Thu, 15 Dec 2016 07:49:29 +0000 Message-ID: <1481788168.2845.1.camel@toradex.com> References: <20161214235746.7108-1-alexandre.belloni@free-electrons.com> <20161214235746.7108-9-alexandre.belloni@free-electrons.com> In-Reply-To: <20161214235746.7108-9-alexandre.belloni@free-electrons.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=marcel.ziswiler@toradex.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [46.140.72.82] x-ms-office365-filtering-correlation-id: cf59ff90-e107-4d2b-cf89-08d424bee696 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:HE1PR05MB1882; x-microsoft-exchange-diagnostics: 1;HE1PR05MB1882;7:nYzRbOEizdI/8UPnSTBWB18hIOtQ7lug/EYyGVdhI1R5sD721isKR3T/ksU9RgPIKw/8fHbpb+WuK5KpBMTLOSUa1P3hGVcgCS8LCfcJ0RszyidxbfCtN/Yzy/8Z9kk4kSwL8NnjkHo1IZFFCUtX8/UkpDIwg4fo66r2h1FJkJ9yeh4V37Pi3N5RHPQfF16GaVGQwyqJuV72AYZg/MhoW3PsM4Z8wEHUhv7V1erQgzkO3WfiubtLaosb7+urzpCJdLA8FiU+244WAA9hAsMRoQo0VSgjkPsecKiuU1ysROtufi3PpMt3dHPRQ6TVgiliCP8fg/jXIMyLa/qaksPjueHxgpvMyjjD8nTHvzKxvAKZJw6Sw4F/NFEMrSnJzUQkK4SJ4ch1C+HVR6XJ8AZzEaoKhcuxCqTIzTghWB2J8+fV2UkHT42H218THnKYhMt/Yyg0fpkAeiGHSiXmgFToSw== x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(211936372134217); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041248)(20161123555025)(20161123558021)(20161123562025)(20161123560025)(20161123564025)(2016111802025)(6072148)(6043046);SRVR:HE1PR05MB1882;BCL:0;PCL:0;RULEID:;SRVR:HE1PR05MB1882; x-forefront-prvs: 0157DEB61B x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(7916002)(39450400003)(39410400002)(39840400002)(189002)(377424004)(199003)(24454002)(66066001)(3660700001)(81156014)(81166006)(77096006)(8666005)(6512006)(230783001)(33646002)(6436002)(38730400001)(122556002)(229853002)(4326007)(68736007)(3280700002)(8676002)(105586002)(25786008)(36756003)(50986999)(54356999)(76176999)(106356001)(106116001)(7736002)(6486002)(6506006)(3846002)(102836003)(6116002)(5001770100001)(97736004)(4001150100001)(103116003)(189998001)(5660300001)(2501003)(92566002)(305945005)(101416001)(2900100001)(8936002)(2906002)(86362001)(2950100002)(7059030)(2004002)(32563001);DIR:OUT;SFP:1102;SCL:1;SRVR:HE1PR05MB1882;H:HE1PR05MB1882.eurprd05.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="utf-8" Content-ID: MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Dec 2016 07:49:29.2628 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d9995866-0d9b-4251-8315-093f062abab4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB1882 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id uBFHR09l027985 Content-Length: 3109 Lines: 67 On Thu, 2016-12-15 at 00:57 +0100, Alexandre Belloni wrote: > 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: Bjorn Helgaas > Cc: Juergen Borleis > Cc: Lucas Stach > Cc: Marcel Ziswiler > Cc: Petr Štetiar > Signed-off-by: Alexandre Belloni electrons.com> Acked-by: Marcel Ziswiler > --- >  arch/arm/boot/dts/imx6q-apalis-ixora.dts | 10 +++++----- >  1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts > b/arch/arm/boot/dts/imx6q-apalis-ixora.dts > index 207b85b91ada..97b9b53a5086 100644 > --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts > +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts > @@ -12,17 +12,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 > @@ -31,11 +31,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.