Reviewed-by: Allison Randal <allison@xxxxxxxxxxx> On 5/22/19 3:51 AM, Thomas Gleixner 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 as > published by the free software foundation or any later at your > option > > extracted by the scancode license scanner the SPDX license identifier > > GPL-2.0-or-later > > has been chosen to replace the boilerplate/reference in 5 file(s). > > Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > > --- > https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch4&id=837cdb861a7f > --- > net/netfilter/nf_conntrack_timeout.c | 5 +---- > net/netfilter/nf_conntrack_timestamp.c | 5 +---- > net/netfilter/nfnetlink_acct.c | 5 +---- > net/netfilter/nfnetlink_cthelper.c | 5 +---- > net/netfilter/nfnetlink_cttimeout.c | 5 +---- > 5 files changed, 5 insertions(+), 20 deletions(-) > > --- a/net/netfilter/nf_conntrack_timeout.c > +++ b/net/netfilter/nf_conntrack_timeout.c > @@ -1,10 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * (C) 2012 by Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> > * (C) 2012 by Vyatta Inc. <http://www.vyatta.com> > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation (or any later at your option). > */ > > #include <linux/types.h> > --- a/net/netfilter/nf_conntrack_timestamp.c > +++ b/net/netfilter/nf_conntrack_timestamp.c > @@ -1,9 +1,6 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * (C) 2010 Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation (or any later at your option). > */ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > --- a/net/netfilter/nfnetlink_acct.c > +++ b/net/netfilter/nfnetlink_acct.c > @@ -1,10 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * (C) 2011 Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> > * (C) 2011 Intra2net AG <http://www.intra2net.com> > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation (or any later at your option). > */ > #include <linux/init.h> > #include <linux/module.h> > --- a/net/netfilter/nfnetlink_cthelper.c > +++ b/net/netfilter/nfnetlink_cthelper.c > @@ -1,10 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * (C) 2012 Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation (or any later at your option). > - * > * This software has been sponsored by Vyatta Inc. <http://www.vyatta.com> > */ > #include <linux/init.h> > --- a/net/netfilter/nfnetlink_cttimeout.c > +++ b/net/netfilter/nfnetlink_cttimeout.c > @@ -1,10 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * (C) 2012 by Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> > * (C) 2012 by Vyatta Inc. <http://www.vyatta.com> > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation (or any later at your option). > */ > #include <linux/init.h> > #include <linux/module.h> > >
