Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935669AbcLOKii (ORCPT ); Thu, 15 Dec 2016 05:38:38 -0500 Received: from mail-wj0-f195.google.com ([209.85.210.195]:33049 "EHLO mail-wj0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935297AbcLOKig (ORCPT ); Thu, 15 Dec 2016 05:38:36 -0500 Subject: Re: [PATCH 23/39] ARM: dts: armada-xp-axpwifiap: Correct license text To: Alexandre Belloni , Gregory Clement References: <20161214223746.23066-1-alexandre.belloni@free-electrons.com> <20161214223746.23066-24-alexandre.belloni@free-electrons.com> Cc: Andrew Lunn , Jason Cooper , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnaud Ebalard , Boris Brezillon , Ezequiel Garcia , Paul Bolle , =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= , Stefan Roese , Thomas Petazzoni From: Sebastian Hesselbarth Message-ID: <37a43cbd-cc36-d3b7-af0b-2a5c1f7d1a08@gmail.com> Date: Thu, 15 Dec 2016 11:38:28 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 In-Reply-To: <20161214223746.23066-24-alexandre.belloni@free-electrons.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3218 Lines: 68 On 14.12.2016 23:37, 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: Arnaud Ebalard > Cc: Boris Brezillon > Cc: Ezequiel Garcia > Cc: Paul Bolle > Cc: Rafał Miłecki > Cc: Sebastian Hesselbarth Feel free to add my Acked-by: Sebastian Hesselbarth for Patches 23, 25, 27, 29, 30, 31, 32, 33, 35, 36, i.e. all I have been in Cc. Sebastian > Cc: Stefan Roese > Cc: Thomas Petazzoni > Signed-off-by: Alexandre Belloni > --- > arch/arm/boot/dts/armada-xp-axpwifiap.dts | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts > index ce152719bc28..6a25eb427822 100644 > --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts > +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts > @@ -20,17 +20,17 @@ > * published by the Free Software Foundation; either version 2 of the > * License, or (at your option) any later version. > * > - * 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 > @@ -39,11 +39,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. >