netfilter: xtables: Bring SPDX identifier back

netfilter: xtables: Bring SPDX identifier back

[Thomas Gleixner]

Commit e2be04c7f995 ("License cleanup: add SPDX license identifier to
uapi header files with a license") added the correct SPDX identifier to
include/uapi/linux/netfilter/xt_IDLETIMER.h.

A subsequent commit removed it for no reason and reintroduced the UAPI
license incorrectness as the file is now missing the UAPI exception
again.

Add it back and remove the GPLv2 boilerplate while at it.

Fixes: 68983a354a65 ("netfilter: xtables: Add snapshot of hardidletimer target")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Manoj Basapathi <manojbm@codeaurora.org>
Cc: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
---
 include/uapi/linux/netfilter/xt_IDLETIMER.h |   17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

--- a/include/uapi/linux/netfilter/xt_IDLETIMER.h
+++ b/include/uapi/linux/netfilter/xt_IDLETIMER.h
@@ -1,6 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
- * linux/include/linux/netfilter/xt_IDLETIMER.h
- *
  * Header file for Xtables timer target module.
  *
  * Copyright (C) 2004, 2010 Nokia Corporation
@@ -10,20 +9,6 @@
  * by Luciano Coelho <luciano.coelho@nokia.com>
  *
  * Contact: Luciano Coelho <luciano.coelho@nokia.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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
  */
 
 #ifndef _XT_IDLETIMER_H

Re: netfilter: xtables: Bring SPDX identifier back

[Pablo Neira Ayuso]

On Mon, Jun 06, 2022 at 05:23:45PM +0200, Thomas Gleixner wrote:
> Commit e2be04c7f995 ("License cleanup: add SPDX license identifier to
> uapi header files with a license") added the correct SPDX identifier to
> include/uapi/linux/netfilter/xt_IDLETIMER.h.
> 
> A subsequent commit removed it for no reason and reintroduced the UAPI
> license incorrectness as the file is now missing the UAPI exception
> again.
> 
> Add it back and remove the GPLv2 boilerplate while at it.

LGTM.

You handle this or I place this in the nf.git tree?

Thanks

Re: netfilter: xtables: Bring SPDX identifier back

[Greg KH]

On Mon, Jun 06, 2022 at 05:34:34PM +0200, Pablo Neira Ayuso wrote:
> On Mon, Jun 06, 2022 at 05:23:45PM +0200, Thomas Gleixner wrote:
> > Commit e2be04c7f995 ("License cleanup: add SPDX license identifier to
> > uapi header files with a license") added the correct SPDX identifier to
> > include/uapi/linux/netfilter/xt_IDLETIMER.h.
> > 
> > A subsequent commit removed it for no reason and reintroduced the UAPI
> > license incorrectness as the file is now missing the UAPI exception
> > again.
> > 
> > Add it back and remove the GPLv2 boilerplate while at it.
> 
> LGTM.
> 
> You handle this or I place this in the nf.git tree?

If you want to take it, that's fine with me, otherwise I can in a
spdx-specific tree that I manage.

Your choice, which ever is easier for you.

thanks,

greg k-h

Re: netfilter: xtables: Bring SPDX identifier back

[Pablo Neira Ayuso]

On Mon, Jun 06, 2022 at 06:56:12PM +0200, Greg KH wrote:
> On Mon, Jun 06, 2022 at 05:34:34PM +0200, Pablo Neira Ayuso wrote:
> > On Mon, Jun 06, 2022 at 05:23:45PM +0200, Thomas Gleixner wrote:
> > > Commit e2be04c7f995 ("License cleanup: add SPDX license identifier to
> > > uapi header files with a license") added the correct SPDX identifier to
> > > include/uapi/linux/netfilter/xt_IDLETIMER.h.
> > > 
> > > A subsequent commit removed it for no reason and reintroduced the UAPI
> > > license incorrectness as the file is now missing the UAPI exception
> > > again.
> > > 
> > > Add it back and remove the GPLv2 boilerplate while at it.
> > 
> > LGTM.
> > 
> > You handle this or I place this in the nf.git tree?
> 
> If you want to take it, that's fine with me, otherwise I can in a
> spdx-specific tree that I manage.

I did not know there is a specific tree for this.

> Your choice, which ever is easier for you.

please take it

Re: netfilter: xtables: Bring SPDX identifier back

[Greg KH]

On Mon, Jun 06, 2022 at 07:01:11PM +0200, Pablo Neira Ayuso wrote:
> On Mon, Jun 06, 2022 at 06:56:12PM +0200, Greg KH wrote:
> > On Mon, Jun 06, 2022 at 05:34:34PM +0200, Pablo Neira Ayuso wrote:
> > > On Mon, Jun 06, 2022 at 05:23:45PM +0200, Thomas Gleixner wrote:
> > > > Commit e2be04c7f995 ("License cleanup: add SPDX license identifier to
> > > > uapi header files with a license") added the correct SPDX identifier to
> > > > include/uapi/linux/netfilter/xt_IDLETIMER.h.
> > > > 
> > > > A subsequent commit removed it for no reason and reintroduced the UAPI
> > > > license incorrectness as the file is now missing the UAPI exception
> > > > again.
> > > > 
> > > > Add it back and remove the GPLv2 boilerplate while at it.
> > > 
> > > LGTM.
> > > 
> > > You handle this or I place this in the nf.git tree?
> > 
> > If you want to take it, that's fine with me, otherwise I can in a
> > spdx-specific tree that I manage.
> 
> I did not know there is a specific tree for this.
> 
> > Your choice, which ever is easier for you.
> 
> please take it

Will do, thanks!

greg k-h