| Message ID | 20190527133857.30108-11-narmstrong@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: meson: update with SPDX Licence identifier | expand |
On Mon, May 27, 2019 at 3:41 PM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Neil Armstrong <narmstrong@baylibre.com> writes: > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > arch/arm/mach-meson/meson.c | 12 +----------- > 1 file changed, 1 insertion(+), 11 deletions(-) > > diff --git a/arch/arm/mach-meson/meson.c b/arch/arm/mach-meson/meson.c > index c8d99df32f9b..04ae414d88c9 100644 > --- a/arch/arm/mach-meson/meson.c > +++ b/arch/arm/mach-meson/meson.c > @@ -1,16 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Copyright (C) 2014 Carlo Caione <carlo@caione.org> > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the License, or > - * (at your option) any later version. > - * > - * This program 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. > - * > */ I dropped this one since it conflicts with one that was already applied to mainline in the treewide cleanup of SPDX headers. The rest of the series is queued for v5.3, Thanks, Kevin
diff --git a/arch/arm/mach-meson/meson.c b/arch/arm/mach-meson/meson.c index c8d99df32f9b..04ae414d88c9 100644 --- a/arch/arm/mach-meson/meson.c +++ b/arch/arm/mach-meson/meson.c @@ -1,16 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2014 Carlo Caione <carlo@caione.org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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. - * */ #include <linux/of_platform.h>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- arch/arm/mach-meson/meson.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)