Reviewed-by: Steve Winslow <swinslow@xxxxxxxxx> On Sun, May 19, 2019 at 1:19 PM Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote: > > Based on 1 normalized pattern(s): > > this program is free software you can redistribute it and or modify > it under the terms of the gnu general public license version 2 or > later as published by the free software foundation > > extracted by the scancode license scanner the SPDX license identifier > > GPL-2.0-or-later > > has been chosen to replace the boilerplate/reference in 9 file(s). > > Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > --- > https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=step2&id=d00e81e6582b > --- > arch/arm/boot/dts/omap3-n900.dts | 5 +---- > arch/mips/jz4740/board-qi_lb60.c | 5 +---- > drivers/hwmon/aspeed-pwm-tacho.c | 5 +---- > net/ipv4/netfilter/nf_dup_ipv4.c | 5 +---- > net/ipv6/netfilter/nf_dup_ipv6.c | 5 +---- > net/netfilter/xt_TEE.c | 5 +---- > sound/soc/atmel/atmel-classd.c | 5 +---- > sound/soc/atmel/atmel-pdmic.c | 5 +---- > 8 files changed, 8 insertions(+), 32 deletions(-) > > --- a/arch/arm/boot/dts/omap3-n900.dts > +++ b/arch/arm/boot/dts/omap3-n900.dts > @@ -1,10 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (C) 2013 Pavel Machek <pavel@xxxxxx> > * Copyright (C) 2013-2014 Aaro Koskinen <aaro.koskinen@xxxxxx> > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 (or later) as > - * published by the Free Software Foundation. > */ > > /dts-v1/; > --- a/arch/mips/jz4740/board-qi_lb60.c > +++ b/arch/mips/jz4740/board-qi_lb60.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * linux/arch/mips/jz4740/board-qi_lb60.c > * > @@ -6,10 +7,6 @@ > * Copyright (c) 2009 Qi Hardware inc., > * Author: Xiangfu Liu <xiangfu@xxxxxxxxxxxxxxx> > * Copyright 2010, Lars-Peter Clausen <lars@xxxxxxxxxx> > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 or later > - * as published by the Free Software Foundation. > */ > > #include <linux/kernel.h> > --- a/drivers/hwmon/aspeed-pwm-tacho.c > +++ b/drivers/hwmon/aspeed-pwm-tacho.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2016 Google, Inc > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 or later as > - * published by the Free Software Foundation. > */ > > #include <linux/clk.h> > --- a/net/ipv4/netfilter/nf_dup_ipv4.c > +++ b/net/ipv4/netfilter/nf_dup_ipv4.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * (C) 2007 by Sebastian Claßen <sebastian.classen@xxxxxxxxxx> > * (C) 2007-2010 by Jan Engelhardt <jengelh@xxxxxxxxxx> > * > * Extracted from xt_TEE.c > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of the GNU General Public License version 2 or later, as > - * published by the Free Software Foundation. > */ > #include <linux/ip.h> > #include <linux/module.h> > --- a/net/ipv6/netfilter/nf_dup_ipv6.c > +++ b/net/ipv6/netfilter/nf_dup_ipv6.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * (C) 2007 by Sebastian Claßen <sebastian.classen@xxxxxxxxxx> > * (C) 2007-2010 by Jan Engelhardt <jengelh@xxxxxxxxxx> > * > * Extracted from xt_TEE.c > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms of the GNU General Public License version 2 or later, as > - * published by the Free Software Foundation. > */ > #include <linux/module.h> > #include <linux/percpu.h> > --- a/net/netfilter/xt_TEE.c > +++ b/net/netfilter/xt_TEE.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * "TEE" target extension for Xtables > * Copyright © Sebastian Claßen, 2007 > @@ -5,10 +6,6 @@ > * > * based on ipt_ROUTE.c from Cédric de Launois > * <delaunois@xxxxxxxxxxx> > - * > - * This program is free software; you can redistribute it and/or > - * modify it under the terms of the GNU General Public License > - * version 2 or later, as published by the Free Software Foundation. > */ > #include <linux/module.h> > #include <linux/skbuff.h> > --- a/sound/soc/atmel/atmel-classd.c > +++ b/sound/soc/atmel/atmel-classd.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* Atmel ALSA SoC Audio Class D Amplifier (CLASSD) driver > * > * Copyright (C) 2015 Atmel > * > * Author: Songjun Wu <songjun.wu@xxxxxxxxx> > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 or later > - * as published by the Free Software Foundation. > */ > > #include <linux/of.h> > --- a/sound/soc/atmel/atmel-pdmic.c > +++ b/sound/soc/atmel/atmel-pdmic.c > @@ -1,12 +1,9 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* Atmel PDMIC driver > * > * Copyright (C) 2015 Atmel > * > * Author: Songjun Wu <songjun.wu@xxxxxxxxx> > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 or later > - * as published by the Free Software Foundation. > */ > > #include <linux/of.h> > > -- Steve Winslow Director of Strategic Programs The Linux Foundation swinslow@xxxxxxxxxxxxxxxxxxx
