Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: xtables: Bring SPDX identifier back

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 <manojbm@codeaurora.org>
Cc: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Thomas Gleixner and committed by
Greg Kroah-Hartman
20646f5b 3e00a22f

+1 -16
+1 -16
include/uapi/linux/netfilter/xt_IDLETIMER.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ 1 2 /* 2 - * linux/include/linux/netfilter/xt_IDLETIMER.h 3 - * 4 3 * Header file for Xtables timer target module. 5 4 * 6 5 * Copyright (C) 2004, 2010 Nokia Corporation ··· 9 10 * by Luciano Coelho <luciano.coelho@nokia.com> 10 11 * 11 12 * Contact: Luciano Coelho <luciano.coelho@nokia.com> 12 - * 13 - * This program is free software; you can redistribute it and/or 14 - * modify it under the terms of the GNU General Public License 15 - * version 2 as published by the Free Software Foundation. 16 - * 17 - * This program is distributed in the hope that it will be useful, but 18 - * WITHOUT ANY WARRANTY; without even the implied warranty of 19 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 20 - * General Public License for more details. 21 - * 22 - * You should have received a copy of the GNU General Public License 23 - * along with this program; if not, write to the Free Software 24 - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 25 - * 02110-1301 USA 26 13 */ 27 14 28 15 #ifndef _XT_IDLETIMER_H