Skip to contentSkip to conversation

netfilter: xtables: Bring SPDX identifier back

PATCH Thomas Gleixner 3 participants 5 messages Jun 6, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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")
Cc Manoj Basapathi <[email protected]>
Cc Subash Abhinov Kasiviswanathan <[email protected]>
Cc Pablo Neira Ayuso <[email protected]>
---
 include/uapi/linux/netfilter/xt_IDLETIMER.h |   17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)
include/uapi/linux/netfilter/xt_IDLETIMER.h +1 -16
@@ -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 <[email protected]>
  *
  * Contact: Luciano Coelho <[email protected]>
- *
- * 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
#1 lore raw
Quoted 9 lines · 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.

LGTM.

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

Thanks

maintainer
#2 lore raw
Quoted 9 lines · Pablo Neira Ayuso
Quoted 8 lines · 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.

Quoted 5 lines
Quoted 1 line

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

#3 lore raw
Quoted 10 lines · Greg KH
Quoted 9 lines · Pablo Neira Ayuso
Quoted 8 lines · 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.

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

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.

Quoted 1 line

Your choice, which ever is easier for you.

please take it

maintainer
#4 lore raw
Quoted 17 lines · Pablo Neira Ayuso
Quoted 16 lines · Greg KH
Quoted 14 lines · Pablo Neira Ayuso
Quoted 9 lines · 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.

LGTM.

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

Quoted 8 lines
Quoted 2 lines

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.

Quoted 1 line

Your choice, which ever is easier for you.

please take it

Will do, thanks!

greg k-h