Received: by 2002:a25:f815:0:0:0:0:0 with SMTP id u21csp1920612ybd; Sun, 23 Jun 2019 20:07:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqyd7Vnc1C9qGjYT5xA3234rAoGkofPBtW6Ao/izVC4nqgcQdUzHDYyzQPLJ2qqkgB5RVy5u X-Received: by 2002:a17:90b:8d2:: with SMTP id ds18mr22605765pjb.132.1561345650459; Sun, 23 Jun 2019 20:07:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561345650; cv=none; d=google.com; s=arc-20160816; b=mz3N/4cS45xoBRehCNsexxGY1mBRjwWzMiK0ocj37s9O/tPwa/WwDAB0eLlmRo+pDM pujGiirnkXkr5lqxxyb7oOpd/mzNQK1IsZGPhpaWpjeuL5iSQyimNiYEIJeEVIeVtgoH OwVRwMY+HPV2sOmIaTR2W1hoYKadUrNXympJGvQteVdmju3lXK6PsIErrHDPJ+vHH25L U8cgBQgr5luNcIAkkgpHE7+iibNR4pHMv+Yimf+Z90e3P5EJ+AJyZ/yj3KaRw+GuvZut sRoGpvGNLmYS+zxfLQWb0MBBCnK5cGE5hRESec4F48keltxJjYOQp2+khRSclFcV3SiH V5Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:subject:cc:to :from:date:dkim-signature; bh=VwqZGev1b++nEtP0m+LLbZXEG5Sjop5vv9JMq813Pz8=; b=HTpZ9bmFjgDo1JmnDMtoCLdoDA84AAPmPcUrEKz0Eot+w5oVE2N2OgWDCo4/EcC7xA 7FSimav/KHbRfWBJeCpBBcxGFVpoDuL3dW59812Pv8bYYaIimZGax3DRTO4CQsVP5oyV Ws5vuebO0Tdi/fZo80MbyuSJilzlvgV7rFG/+f7IPUsCiTe3u7nYOsCS/1Q6tXmZsotW WyDJOTBywoDtnx7pBTyPNh4q+e+8sVODIA3GbTnIFDQqX5gSbPfNFlEGpdnuCaQb67Ej Zjm2/GBnmMKj0vD1yzDG5k0/pz4i/hj7rs+Wn1Reb0xGWQKf6N+GKs3J5mO03Ns0+xeN Pvxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=G1R0Z3ou; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n2si9094826pgv.394.2019.06.23.20.07.14; Sun, 23 Jun 2019 20:07:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=G1R0Z3ou; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726980AbfFXDHJ (ORCPT + 99 others); Sun, 23 Jun 2019 23:07:09 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:48129 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726323AbfFXDHI (ORCPT ); Sun, 23 Jun 2019 23:07:08 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 45XDjH4jSwz9s5c; Mon, 24 Jun 2019 13:06:58 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1561345620; bh=dwaO/C2xGPho3+xJTJ5X5VkmYAgKAaMYHky8EdG4Q78=; h=Date:From:To:Cc:Subject:From; b=G1R0Z3ouizfjBLA5L4x/vP7Ukq/DfBTiQY5GE1rea1Q0svzKpPdec709A1wohloNe 9sR3U65hto4UdjPYf5D8rpk2nQzjEtY0S1v7XUht134QhaTKr8e4VAbfBwVE6yU1xD ybk+AIx3Uqbkcx2wPLXNASMB9W7D+tEU2t7VrLAsNzchInNWRESV9Xckv9sWguHbYp 7YzxPbbwOjpGMz9U5QtABHXc5N3gfWKVp/l3n9YEjDqECVoIKdYhQTnKt96/A5F7sl O9gfZDlYrGfGWiDAkLmfyWkr+MrtV+1x4zAlrXAQFks7nTAAOpBztHfTAnV0Wtyho0 YCEyVKcw4+DeQ== Date: Mon, 24 Jun 2019 13:06:53 +1000 From: Stephen Rothwell To: Pablo Neira Ayuso , NetFilter Cc: Linux Next Mailing List , Linux Kernel Mailing List , Jozsef Kadlecsik , Thomas Gleixner , Greg Kroah-Hartman Subject: linux-next: manual merge of the netfilter-next tree with Linus' tree Message-ID: <20190624130653.64016e85@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/6mot5skLooM.T4TIYECrW5B"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/6mot5skLooM.T4TIYECrW5B Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the netfilter-next tree got conflicts in: include/linux/netfilter/ipset/ip_set.h include/linux/netfilter/ipset/ip_set_counter.h include/linux/netfilter/ipset/ip_set_skbinfo.h include/linux/netfilter/ipset/ip_set_timeout.h net/netfilter/ipset/ip_set_bitmap_gen.h net/netfilter/ipset/ip_set_bitmap_ip.c net/netfilter/ipset/ip_set_bitmap_ipmac.c net/netfilter/ipset/ip_set_bitmap_port.c net/netfilter/ipset/ip_set_core.c net/netfilter/ipset/ip_set_getport.c net/netfilter/ipset/ip_set_hash_gen.h net/netfilter/ipset/ip_set_hash_ip.c net/netfilter/ipset/ip_set_hash_ipmark.c net/netfilter/ipset/ip_set_hash_ipport.c net/netfilter/ipset/ip_set_hash_ipportip.c net/netfilter/ipset/ip_set_hash_ipportnet.c net/netfilter/ipset/ip_set_hash_mac.c net/netfilter/ipset/ip_set_hash_net.c net/netfilter/ipset/ip_set_hash_netiface.c net/netfilter/ipset/ip_set_hash_netnet.c net/netfilter/ipset/ip_set_hash_netport.c net/netfilter/ipset/ip_set_hash_netportnet.c net/netfilter/ipset/ip_set_list_set.c net/netfilter/xt_set.c between commit: d2912cb15bdd ("treewide: Replace GPLv2 boilerplate/reference with SPDX - = rule 500") from Linus' tree and commit: fe03d4745675 ("Update my email address") from the netfilter-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc include/linux/netfilter/ipset/ip_set.h index f5e03809cdb2,f5c6e7cd6469..000000000000 --- a/include/linux/netfilter/ipset/ip_set.h +++ b/include/linux/netfilter/ipset/ip_set.h @@@ -2,7 -1,11 +2,7 @@@ /* Copyright (C) 2000-2002 Joakim Axelsson * Patrick Schaaf * Martin Josefsson - * Copyright (C) 2003-2013 Jozsef Kadlecsik + * Copyright (C) 2003-2013 Jozsef Kadlecsik - * - * 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. */ #ifndef _IP_SET_H #define _IP_SET_H diff --cc include/linux/netfilter/ipset/ip_set_counter.h index 5477492c8374,305aeda2a899..000000000000 --- a/include/linux/netfilter/ipset/ip_set_counter.h +++ b/include/linux/netfilter/ipset/ip_set_counter.h @@@ -2,7 -1,11 +2,7 @@@ #ifndef _IP_SET_COUNTER_H #define _IP_SET_COUNTER_H =20 - /* Copyright (C) 2015 Jozsef Kadlecsik + /* Copyright (C) 2015 Jozsef Kadlecsik - * - * 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. */ =20 #ifdef __KERNEL__ diff --cc include/linux/netfilter/ipset/ip_set_skbinfo.h index aae081e085c6,fac57ef854c2..000000000000 --- a/include/linux/netfilter/ipset/ip_set_skbinfo.h +++ b/include/linux/netfilter/ipset/ip_set_skbinfo.h @@@ -2,7 -1,11 +2,7 @@@ #ifndef _IP_SET_SKBINFO_H #define _IP_SET_SKBINFO_H =20 - /* Copyright (C) 2015 Jozsef Kadlecsik + /* Copyright (C) 2015 Jozsef Kadlecsik - * - * 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. */ =20 #ifdef __KERNEL__ diff --cc include/linux/netfilter/ipset/ip_set_timeout.h index 88926b4c75f0,dc74150f3432..000000000000 --- a/include/linux/netfilter/ipset/ip_set_timeout.h +++ b/include/linux/netfilter/ipset/ip_set_timeout.h @@@ -2,7 -1,11 +2,7 @@@ #ifndef _IP_SET_TIMEOUT_H #define _IP_SET_TIMEOUT_H =20 - /* Copyright (C) 2003-2013 Jozsef Kadlecsik + /* Copyright (C) 2003-2013 Jozsef Kadlecsik - * - * 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. */ =20 #ifdef __KERNEL__ diff --cc net/netfilter/ipset/ip_set_bitmap_gen.h index 8acc4e173167,29c1e9a50601..000000000000 --- a/net/netfilter/ipset/ip_set_bitmap_gen.h +++ b/net/netfilter/ipset/ip_set_bitmap_gen.h @@@ -1,5 -1,8 +1,5 @@@ +/* SPDX-License-Identifier: GPL-2.0-only */ - /* Copyright (C) 2013 Jozsef Kadlecsik + /* Copyright (C) 2013 Jozsef Kadlecsik - * - * 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. */ =20 #ifndef __IP_SET_BITMAP_IP_GEN_H diff --cc net/netfilter/ipset/ip_set_bitmap_ip.c index e3884b0cca91,5a66c5499700..000000000000 --- a/net/netfilter/ipset/ip_set_bitmap_ip.c +++ b/net/netfilter/ipset/ip_set_bitmap_ip.c @@@ -1,7 -1,10 +1,7 @@@ +// SPDX-License-Identifier: GPL-2.0-only /* Copyright (C) 2000-2002 Joakim Axelsson * Patrick Schaaf - * Copyright (C) 2003-2013 Jozsef Kadlecsik + * Copyright (C) 2003-2013 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module implementing an IP set type: the bitmap:ip type */ diff --cc net/netfilter/ipset/ip_set_bitmap_ipmac.c index b73c37b3a791,ec7a8b12642c..000000000000 --- a/net/netfilter/ipset/ip_set_bitmap_ipmac.c +++ b/net/netfilter/ipset/ip_set_bitmap_ipmac.c @@@ -2,7 -1,11 +2,7 @@@ /* Copyright (C) 2000-2002 Joakim Axelsson * Patrick Schaaf * Martin Josefsson - * Copyright (C) 2003-2013 Jozsef Kadlecsik + * Copyright (C) 2003-2013 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module implementing an IP set type: the bitmap:ip,mac type */ diff --cc net/netfilter/ipset/ip_set_bitmap_port.c index d8c140553379,18275ec4924c..000000000000 --- a/net/netfilter/ipset/ip_set_bitmap_port.c +++ b/net/netfilter/ipset/ip_set_bitmap_port.c @@@ -1,5 -1,8 +1,5 @@@ +// SPDX-License-Identifier: GPL-2.0-only - /* Copyright (C) 2003-2013 Jozsef Kadlecsik + /* Copyright (C) 2003-2013 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module implementing an IP set type: the bitmap:port type */ diff --cc net/netfilter/ipset/ip_set_core.c index 3cdf171cd468,18430ad2fdf2..000000000000 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@@ -1,7 -1,10 +1,7 @@@ +// SPDX-License-Identifier: GPL-2.0-only /* Copyright (C) 2000-2002 Joakim Axelsson * Patrick Schaaf - * Copyright (C) 2003-2013 Jozsef Kadlecsik + * Copyright (C) 2003-2013 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module for IP set management */ diff --cc net/netfilter/ipset/ip_set_getport.c index 2384e36aef5c,dc7b46b41354..000000000000 --- a/net/netfilter/ipset/ip_set_getport.c +++ b/net/netfilter/ipset/ip_set_getport.c @@@ -1,5 -1,8 +1,5 @@@ +// SPDX-License-Identifier: GPL-2.0-only - /* Copyright (C) 2003-2011 Jozsef Kadlecsik + /* Copyright (C) 2003-2011 Jozsef Kadlecsik - * - * 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. */ =20 /* Get Layer-4 data from the packets */ diff --cc net/netfilter/ipset/ip_set_hash_gen.h index 10f619625abd,07ef941130a6..000000000000 --- a/net/netfilter/ipset/ip_set_hash_gen.h +++ b/net/netfilter/ipset/ip_set_hash_gen.h @@@ -1,5 -1,8 +1,5 @@@ +/* SPDX-License-Identifier: GPL-2.0-only */ - /* Copyright (C) 2013 Jozsef Kadlecsik + /* Copyright (C) 2013 Jozsef Kadlecsik - * - * 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. */ =20 #ifndef _IP_SET_HASH_GEN_H diff --cc net/netfilter/ipset/ip_set_hash_ip.c index 69d7576be2e6,7b82bf1104ce..000000000000 --- a/net/netfilter/ipset/ip_set_hash_ip.c +++ b/net/netfilter/ipset/ip_set_hash_ip.c @@@ -1,5 -1,8 +1,5 @@@ +// SPDX-License-Identifier: GPL-2.0-only - /* Copyright (C) 2003-2013 Jozsef Kadlecsik + /* Copyright (C) 2003-2013 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module implementing an IP set type: the hash:ip type */ diff --cc net/netfilter/ipset/ip_set_hash_ipmark.c index 6fe1ec0d2154,7d468f98a252..000000000000 --- a/net/netfilter/ipset/ip_set_hash_ipmark.c +++ b/net/netfilter/ipset/ip_set_hash_ipmark.c @@@ -1,6 -1,9 +1,6 @@@ +// SPDX-License-Identifier: GPL-2.0-only - /* Copyright (C) 2003-2013 Jozsef Kadlecsik + /* Copyright (C) 2003-2013 Jozsef Kadlecsik * Copyright (C) 2013 Smoothwall Ltd. - * - * 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. */ =20 /* Kernel module implementing an IP set type: the hash:ip,mark type */ diff --cc net/netfilter/ipset/ip_set_hash_ipport.c index 74ec7e097e34,d358ee69d04b..000000000000 --- a/net/netfilter/ipset/ip_set_hash_ipport.c +++ b/net/netfilter/ipset/ip_set_hash_ipport.c @@@ -1,5 -1,8 +1,5 @@@ +// SPDX-License-Identifier: GPL-2.0-only - /* Copyright (C) 2003-2013 Jozsef Kadlecsik + /* Copyright (C) 2003-2013 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module implementing an IP set type: the hash:ip,port type */ diff --cc net/netfilter/ipset/ip_set_hash_ipportip.c index ced57d63b01f,0a304785f912..000000000000 --- a/net/netfilter/ipset/ip_set_hash_ipportip.c +++ b/net/netfilter/ipset/ip_set_hash_ipportip.c @@@ -1,5 -1,8 +1,5 @@@ +// SPDX-License-Identifier: GPL-2.0-only - /* Copyright (C) 2003-2013 Jozsef Kadlecsik + /* Copyright (C) 2003-2013 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module implementing an IP set type: the hash:ip,port,ip type */ diff --cc net/netfilter/ipset/ip_set_hash_ipportnet.c index 905f6cf0f55e,245f7d714870..000000000000 --- a/net/netfilter/ipset/ip_set_hash_ipportnet.c +++ b/net/netfilter/ipset/ip_set_hash_ipportnet.c @@@ -1,5 -1,8 +1,5 @@@ +// SPDX-License-Identifier: GPL-2.0-only - /* Copyright (C) 2003-2013 Jozsef Kadlecsik + /* Copyright (C) 2003-2013 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module implementing an IP set type: the hash:ip,port,net type */ diff --cc net/netfilter/ipset/ip_set_hash_mac.c index 853e772ab4d9,3d1fc71dac38..000000000000 --- a/net/netfilter/ipset/ip_set_hash_mac.c +++ b/net/netfilter/ipset/ip_set_hash_mac.c @@@ -1,5 -1,8 +1,5 @@@ +// SPDX-License-Identifier: GPL-2.0-only - /* Copyright (C) 2014 Jozsef Kadlecsik + /* Copyright (C) 2014 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module implementing an IP set type: the hash:mac type */ diff --cc net/netfilter/ipset/ip_set_hash_net.c index 06c91e49bf25,470701fda231..000000000000 --- a/net/netfilter/ipset/ip_set_hash_net.c +++ b/net/netfilter/ipset/ip_set_hash_net.c @@@ -1,5 -1,8 +1,5 @@@ +// SPDX-License-Identifier: GPL-2.0-only - /* Copyright (C) 2003-2013 Jozsef Kadlecsik + /* Copyright (C) 2003-2013 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module implementing an IP set type: the hash:net type */ diff --cc net/netfilter/ipset/ip_set_hash_netiface.c index 0a8cbcdfb42b,1df8656ad84d..000000000000 --- a/net/netfilter/ipset/ip_set_hash_netiface.c +++ b/net/netfilter/ipset/ip_set_hash_netiface.c @@@ -1,5 -1,8 +1,5 @@@ +// SPDX-License-Identifier: GPL-2.0-only - /* Copyright (C) 2011-2013 Jozsef Kadlecsik + /* Copyright (C) 2011-2013 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module implementing an IP set type: the hash:net,iface type */ diff --cc net/netfilter/ipset/ip_set_hash_netnet.c index 832e4f5491cb,e0553be89600..000000000000 --- a/net/netfilter/ipset/ip_set_hash_netnet.c +++ b/net/netfilter/ipset/ip_set_hash_netnet.c @@@ -1,6 -1,9 +1,6 @@@ +// SPDX-License-Identifier: GPL-2.0-only - /* Copyright (C) 2003-2013 Jozsef Kadlecsik + /* Copyright (C) 2003-2013 Jozsef Kadlecsik * Copyright (C) 2013 Oliver Smith - * - * 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. */ =20 /* Kernel module implementing an IP set type: the hash:net type */ diff --cc net/netfilter/ipset/ip_set_hash_netport.c index a4f3f15b874a,943d55d76fcf..000000000000 --- a/net/netfilter/ipset/ip_set_hash_netport.c +++ b/net/netfilter/ipset/ip_set_hash_netport.c @@@ -1,5 -1,8 +1,5 @@@ +// SPDX-License-Identifier: GPL-2.0-only - /* Copyright (C) 2003-2013 Jozsef Kadlecsik + /* Copyright (C) 2003-2013 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module implementing an IP set type: the hash:net,port type */ diff --cc net/netfilter/ipset/ip_set_hash_netportnet.c index e54d415405f3,afaff99e578c..000000000000 --- a/net/netfilter/ipset/ip_set_hash_netportnet.c +++ b/net/netfilter/ipset/ip_set_hash_netportnet.c @@@ -1,5 -1,8 +1,5 @@@ +// SPDX-License-Identifier: GPL-2.0-only - /* Copyright (C) 2003-2013 Jozsef Kadlecsik + /* Copyright (C) 2003-2013 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module implementing an IP set type: the hash:ip,port,net type */ diff --cc net/netfilter/ipset/ip_set_list_set.c index 8ada318bf09d,ed4360072f64..000000000000 --- a/net/netfilter/ipset/ip_set_list_set.c +++ b/net/netfilter/ipset/ip_set_list_set.c @@@ -1,5 -1,8 +1,5 @@@ +// SPDX-License-Identifier: GPL-2.0-only - /* Copyright (C) 2008-2013 Jozsef Kadlecsik + /* Copyright (C) 2008-2013 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module implementing an IP set type: the list:set type */ diff --cc net/netfilter/xt_set.c index f099228cb9c4,f025c51ba375..000000000000 --- a/net/netfilter/xt_set.c +++ b/net/netfilter/xt_set.c @@@ -2,7 -1,11 +2,7 @@@ /* Copyright (C) 2000-2002 Joakim Axelsson * Patrick Schaaf * Martin Josefsson - * Copyright (C) 2003-2013 Jozsef Kadlecsik + * Copyright (C) 2003-2013 Jozsef Kadlecsik - * - * 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. */ =20 /* Kernel module which implements the set match and SET target --Sig_/6mot5skLooM.T4TIYECrW5B Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0QPk0ACgkQAVBC80lX 0Gwi5gf/erXv7gS0AVA1pLAkZNWC4grWZ9V6OnU9KWWZkWdAzNuVSDgNGsOK0BZU wJEJu7s2CQCZZ8i06KBsNLSnwGcAXyK3ATNSttRXq2bHshprimN4gQWPT6oOwIeY yTnxD3y4RT2hwZGVXpWJgWJiZ5jm7Y2A5vyka5gzVpK0nbS2aZSdgIPtiLuQNR9O QZYT00UqQwI02cv81b1IELHbTxyAIQS+GJutHGWSzFlx+Pjc644UUBippMnZSXJt 83OL8buxSDnTKNQ34y0oJ6r6Q32bi/SJvRlnlQqxnx2QOzgzGoxJcwwDrmC29Qgk yLeNUlcMwjFG78HnvuvE4T2qNswaUQ== =h34A -----END PGP SIGNATURE----- --Sig_/6mot5skLooM.T4TIYECrW5B--