Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Resolve conflict between d2912cb15bdd ("treewide: Replace GPLv2
boilerplate/reference with SPDX - rule 500") removing the GPL disclaimer
and fe03d4745675 ("Update my email address") which updates Jozsef
Kadlecsik's email.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --cc CREDITS
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc include/linux/netfilter/ipset/ip_set.h
index f5c6e7c,f5e0380..12ad9b1
--- 1/include/linux/netfilter/ipset/ip_set.h
--- 2/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
@@@ -1,11 -2,7 +2,7 @@@
  /* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
   *                         Patrick Schaaf <bof@bof.de>
   *                         Martin Josefsson <gandalf@wlug.westbo.se>
 - * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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 305aeda,5477492..3400958
--- 1/include/linux/netfilter/ipset/ip_set_counter.h
--- 2/include/linux/netfilter/ipset/ip_set_counter.h
+++ b/include/linux/netfilter/ipset/ip_set_counter.h
@@@ -1,12 -2,8 +2,7 @@@
  #ifndef _IP_SET_COUNTER_H
  #define _IP_SET_COUNTER_H
  
- /* Copyright (C) 2015 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
 -/* Copyright (C) 2015 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
-- */
++/* Copyright (C) 2015 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  #ifdef __KERNEL__
  

diff --cc include/linux/netfilter/ipset/ip_set_skbinfo.h
index fac57ef,aae081e..3a2df02
--- 1/include/linux/netfilter/ipset/ip_set_skbinfo.h
--- 2/include/linux/netfilter/ipset/ip_set_skbinfo.h
+++ b/include/linux/netfilter/ipset/ip_set_skbinfo.h
@@@ -1,12 -2,8 +2,7 @@@
  #ifndef _IP_SET_SKBINFO_H
  #define _IP_SET_SKBINFO_H
  
- /* Copyright (C) 2015 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
 -/* Copyright (C) 2015 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
-- */
++/* Copyright (C) 2015 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  #ifdef __KERNEL__
  

diff --cc include/linux/netfilter/ipset/ip_set_timeout.h
index dc74150,88926b4..2be60e3
--- 1/include/linux/netfilter/ipset/ip_set_timeout.h
--- 2/include/linux/netfilter/ipset/ip_set_timeout.h
+++ b/include/linux/netfilter/ipset/ip_set_timeout.h
@@@ -1,12 -2,8 +2,7 @@@
  #ifndef _IP_SET_TIMEOUT_H
  #define _IP_SET_TIMEOUT_H
  
- /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
-- */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  #ifdef __KERNEL__
  

diff --cc net/bridge/br_netfilter_hooks.c
Simple merge

diff --cc net/bridge/br_netfilter_ipv6.c
Simple merge

diff --cc net/ipv4/netfilter/ipt_SYNPROXY.c
index 0c80616,64d9563..8e7f84e
--- 1/net/ipv4/netfilter/ipt_SYNPROXY.c
--- 2/net/ipv4/netfilter/ipt_SYNPROXY.c
+++ b/net/ipv4/netfilter/ipt_SYNPROXY.c
@@@ -1,11 -1,12 +1,8 @@@
+ // SPDX-License-Identifier: GPL-2.0-only
  /*
   * Copyright (c) 2013 Patrick McHardy <kaber@trash.net>
-  *
-  * 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.
   */
  
 -#include <linux/module.h>
 -#include <linux/skbuff.h>
 -#include <net/tcp.h>
 -
  #include <linux/netfilter_ipv4/ip_tables.h>
  #include <linux/netfilter/x_tables.h>
  #include <linux/netfilter/xt_SYNPROXY.h>

diff --cc net/ipv4/netfilter/nf_nat_h323.c
index 076b6b2,f03340e..87b711f
--- 1/net/ipv4/netfilter/nf_nat_h323.c
--- 2/net/ipv4/netfilter/nf_nat_h323.c
+++ b/net/ipv4/netfilter/nf_nat_h323.c
@@@ -4,10 -5,8 +5,8 @@@
   * Copyright (c) 2006 Jing Min Zhao <zhaojingmin@users.sourceforge.net>
   * Copyright (c) 2006-2012 Patrick McHardy <kaber@trash.net>
   *
-  * This source code is licensed under General Public License version 2.
-  *
   * Based on the 'brute force' H.323 NAT module by
 - * Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + * Jozsef Kadlecsik <kadlec@netfilter.org>
   */
  
  #include <linux/module.h>

diff --cc net/ipv6/netfilter/ip6t_SYNPROXY.c
index 55a9b92,41325d5..e77ea1e
--- 1/net/ipv6/netfilter/ip6t_SYNPROXY.c
--- 2/net/ipv6/netfilter/ip6t_SYNPROXY.c
+++ b/net/ipv6/netfilter/ip6t_SYNPROXY.c
@@@ -1,11 -1,14 +1,8 @@@
+ // SPDX-License-Identifier: GPL-2.0-only
  /*
   * Copyright (c) 2013 Patrick McHardy <kaber@trash.net>
-  *
-  * 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.
   */
  
 -#include <linux/module.h>
 -#include <linux/skbuff.h>
 -#include <net/ip6_checksum.h>
 -#include <net/ip6_route.h>
 -#include <net/tcp.h>
 -
  #include <linux/netfilter_ipv6/ip6_tables.h>
  #include <linux/netfilter/x_tables.h>
  #include <linux/netfilter/xt_SYNPROXY.h>

diff --cc net/netfilter/ipset/ip_set_bitmap_gen.h
index 29c1e9a,8acc4e1..063df74
--- 1/net/netfilter/ipset/ip_set_bitmap_gen.h
--- 2/net/netfilter/ipset/ip_set_bitmap_gen.h
+++ b/net/netfilter/ipset/ip_set_bitmap_gen.h
@@@ -1,9 -1,6 +1,5 @@@
- /* Copyright (C) 2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
-  */
+ /* SPDX-License-Identifier: GPL-2.0-only */
 -/* Copyright (C) 2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 - */
++/* Copyright (C) 2013 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  #ifndef __IP_SET_BITMAP_IP_GEN_H
  #define __IP_SET_BITMAP_IP_GEN_H

diff --cc net/netfilter/ipset/ip_set_bitmap_ip.c
index 5a66c54,e3884b0..11ff9d4
--- 1/net/netfilter/ipset/ip_set_bitmap_ip.c
--- 2/net/netfilter/ipset/ip_set_bitmap_ip.c
+++ b/net/netfilter/ipset/ip_set_bitmap_ip.c
@@@ -1,10 -1,7 +1,7 @@@
+ // SPDX-License-Identifier: GPL-2.0-only
  /* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
   *                         Patrick Schaaf <bof@bof.de>
 - * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
   */
  
  /* Kernel module implementing an IP set type: the bitmap:ip type */

diff --cc net/netfilter/ipset/ip_set_bitmap_ipmac.c
index ec7a8b1,b73c37b..ca7ac4a
--- 1/net/netfilter/ipset/ip_set_bitmap_ipmac.c
--- 2/net/netfilter/ipset/ip_set_bitmap_ipmac.c
+++ b/net/netfilter/ipset/ip_set_bitmap_ipmac.c
@@@ -1,11 -2,7 +2,6 @@@
  /* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
   *                         Patrick Schaaf <bof@bof.de>
   *                       Martin Josefsson <gandalf@wlug.westbo.se>
-  * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
 - * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
   */
  
  /* Kernel module implementing an IP set type: the bitmap:ip,mac type */

diff --cc net/netfilter/ipset/ip_set_bitmap_port.c
index 18275ec,d8c1405..704a0dd
--- 1/net/netfilter/ipset/ip_set_bitmap_port.c
--- 2/net/netfilter/ipset/ip_set_bitmap_port.c
+++ b/net/netfilter/ipset/ip_set_bitmap_port.c
@@@ -1,9 -1,6 +1,5 @@@
- /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  /* Kernel module implementing an IP set type: the bitmap:port type */
  

diff --cc net/netfilter/ipset/ip_set_core.c
index 18430ad,3cdf171..2e15185
--- 1/net/netfilter/ipset/ip_set_core.c
--- 2/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@@ -1,10 -1,7 +1,7 @@@
+ // SPDX-License-Identifier: GPL-2.0-only
  /* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
   *                         Patrick Schaaf <bof@bof.de>
 - * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
   */
  
  /* Kernel module for IP set management */

diff --cc net/netfilter/ipset/ip_set_getport.c
index dc7b46b,2384e36..2b8f959
--- 1/net/netfilter/ipset/ip_set_getport.c
--- 2/net/netfilter/ipset/ip_set_getport.c
+++ b/net/netfilter/ipset/ip_set_getport.c
@@@ -1,8 -1,5 +1,9 @@@
 -/* Copyright (C) 2003-2011 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ // SPDX-License-Identifier: GPL-2.0-only
 +/* Copyright (C) 2003-2011 Jozsef Kadlecsik <kadlec@netfilter.org>
 + *
 + * 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.
   */
  
  /* Get Layer-4 data from the packets */

diff --cc net/netfilter/ipset/ip_set_hash_gen.h
index 07ef941,10f6196..0feb77f
--- 1/net/netfilter/ipset/ip_set_hash_gen.h
--- 2/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/net/netfilter/ipset/ip_set_hash_gen.h
@@@ -1,9 -1,6 +1,5 @@@
- /* Copyright (C) 2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
-  */
+ /* SPDX-License-Identifier: GPL-2.0-only */
 -/* Copyright (C) 2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 - */
++/* Copyright (C) 2013 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  #ifndef _IP_SET_HASH_GEN_H
  #define _IP_SET_HASH_GEN_H

diff --cc net/netfilter/ipset/ip_set_hash_ip.c
index 7b82bf1,69d7576..f4432d9
--- 1/net/netfilter/ipset/ip_set_hash_ip.c
--- 2/net/netfilter/ipset/ip_set_hash_ip.c
+++ b/net/netfilter/ipset/ip_set_hash_ip.c
@@@ -1,9 -1,6 +1,5 @@@
- /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  /* Kernel module implementing an IP set type: the hash:ip type */
  

diff --cc net/netfilter/ipset/ip_set_hash_ipmark.c
index 7d468f9,6fe1ec0..7a1734a
--- 1/net/netfilter/ipset/ip_set_hash_ipmark.c
--- 2/net/netfilter/ipset/ip_set_hash_ipmark.c
+++ b/net/netfilter/ipset/ip_set_hash_ipmark.c
@@@ -1,10 -1,7 +1,5 @@@
- /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  * Copyright (C) 2013 Smoothwall Ltd. <vytas.dauksa@smoothwall.net>
-  *
-  * 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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 - * Copyright (C) 2013 Smoothwall Ltd. <vytas.dauksa@smoothwall.net>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  /* Kernel module implementing an IP set type: the hash:ip,mark type */
  

diff --cc net/netfilter/ipset/ip_set_hash_ipport.c
index d358ee6,74ec7e0..32e2406
--- 1/net/netfilter/ipset/ip_set_hash_ipport.c
--- 2/net/netfilter/ipset/ip_set_hash_ipport.c
+++ b/net/netfilter/ipset/ip_set_hash_ipport.c
@@@ -1,9 -1,6 +1,5 @@@
- /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  /* Kernel module implementing an IP set type: the hash:ip,port type */
  

diff --cc net/netfilter/ipset/ip_set_hash_ipportip.c
index 0a30478,ced57d6..15d4193
--- 1/net/netfilter/ipset/ip_set_hash_ipportip.c
--- 2/net/netfilter/ipset/ip_set_hash_ipportip.c
+++ b/net/netfilter/ipset/ip_set_hash_ipportip.c
@@@ -1,9 -1,6 +1,5 @@@
- /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  /* Kernel module implementing an IP set type: the hash:ip,port,ip type */
  

diff --cc net/netfilter/ipset/ip_set_hash_ipportnet.c
index 245f7d7,905f6cf..7a4d7af
--- 1/net/netfilter/ipset/ip_set_hash_ipportnet.c
--- 2/net/netfilter/ipset/ip_set_hash_ipportnet.c
+++ b/net/netfilter/ipset/ip_set_hash_ipportnet.c
@@@ -1,9 -1,6 +1,5 @@@
- /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  /* Kernel module implementing an IP set type: the hash:ip,port,net type */
  

diff --cc net/netfilter/ipset/ip_set_hash_mac.c
index 3d1fc71,853e772..d94c585
--- 1/net/netfilter/ipset/ip_set_hash_mac.c
--- 2/net/netfilter/ipset/ip_set_hash_mac.c
+++ b/net/netfilter/ipset/ip_set_hash_mac.c
@@@ -1,9 -1,6 +1,5 @@@
- /* Copyright (C) 2014 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2014 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 - */
++/* Copyright (C) 2014 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  /* Kernel module implementing an IP set type: the hash:mac type */
  

diff --cc net/netfilter/ipset/ip_set_hash_net.c
index 470701f,06c91e4..c259cbc
--- 1/net/netfilter/ipset/ip_set_hash_net.c
--- 2/net/netfilter/ipset/ip_set_hash_net.c
+++ b/net/netfilter/ipset/ip_set_hash_net.c
@@@ -1,9 -1,6 +1,5 @@@
- /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  /* Kernel module implementing an IP set type: the hash:net type */
  

diff --cc net/netfilter/ipset/ip_set_hash_netiface.c
index 1df8656,0a8cbcd..87b29f9
--- 1/net/netfilter/ipset/ip_set_hash_netiface.c
--- 2/net/netfilter/ipset/ip_set_hash_netiface.c
+++ b/net/netfilter/ipset/ip_set_hash_netiface.c
@@@ -1,9 -1,6 +1,5 @@@
- /* Copyright (C) 2011-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2011-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 - */
++/* Copyright (C) 2011-2013 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  /* Kernel module implementing an IP set type: the hash:net,iface type */
  

diff --cc net/netfilter/ipset/ip_set_hash_netnet.c
index e0553be,832e4f5..a3ae69b
--- 1/net/netfilter/ipset/ip_set_hash_netnet.c
--- 2/net/netfilter/ipset/ip_set_hash_netnet.c
+++ b/net/netfilter/ipset/ip_set_hash_netnet.c
@@@ -1,9 -1,6 +1,6 @@@
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ // SPDX-License-Identifier: GPL-2.0-only
 +/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
   * Copyright (C) 2013 Oliver Smith <oliver@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>
-  *
-  * 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.
   */
  
  /* Kernel module implementing an IP set type: the hash:net type */

diff --cc net/netfilter/ipset/ip_set_hash_netport.c
index 943d55d,a4f3f15..799f227
--- 1/net/netfilter/ipset/ip_set_hash_netport.c
--- 2/net/netfilter/ipset/ip_set_hash_netport.c
+++ b/net/netfilter/ipset/ip_set_hash_netport.c
@@@ -1,9 -1,6 +1,5 @@@
- /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  /* Kernel module implementing an IP set type: the hash:net,port type */
  

diff --cc net/netfilter/ipset/ip_set_hash_netportnet.c
index afaff99,e54d415..a82b70e
--- 1/net/netfilter/ipset/ip_set_hash_netportnet.c
--- 2/net/netfilter/ipset/ip_set_hash_netportnet.c
+++ b/net/netfilter/ipset/ip_set_hash_netportnet.c
@@@ -1,9 -1,6 +1,5 @@@
- /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  /* Kernel module implementing an IP set type: the hash:ip,port,net type */
  

diff --cc net/netfilter/ipset/ip_set_list_set.c
index ed43600,8ada318..6f9ead6
--- 1/net/netfilter/ipset/ip_set_list_set.c
--- 2/net/netfilter/ipset/ip_set_list_set.c
+++ b/net/netfilter/ipset/ip_set_list_set.c
@@@ -1,9 -1,6 +1,5 @@@
- /* Copyright (C) 2008-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2008-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 - */
++/* Copyright (C) 2008-2013 Jozsef Kadlecsik <kadlec@netfilter.org> */
  
  /* Kernel module implementing an IP set type: the list:set type */
  

diff --cc net/netfilter/nf_conntrack_core.c
Simple merge

diff --cc net/netfilter/nf_conntrack_h323_main.c
index 1ff66e0,fac6986..6497e5f
--- 1/net/netfilter/nf_conntrack_h323_main.c
--- 2/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@@ -4,10 -5,8 +5,8 @@@
   * Copyright (c) 2006 Jing Min Zhao <zhaojingmin@users.sourceforge.net>
   * Copyright (c) 2006-2012 Patrick McHardy <kaber@trash.net>
   *
-  * This source code is licensed under General Public License version 2.
-  *
   * Based on the 'brute force' H.323 connection tracking module by
 - * Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + * Jozsef Kadlecsik <kadlec@netfilter.org>
   *
   * For more information, please see http://nath323.sourceforge.net/
   */

diff --cc net/netfilter/nf_conntrack_proto_tcp.c
index 60b6840,1e2cc83..d5fdfa0
--- 1/net/netfilter/nf_conntrack_proto_tcp.c
--- 2/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@@ -1,11 -1,8 +1,8 @@@
+ // SPDX-License-Identifier: GPL-2.0-only
  /* (C) 1999-2001 Paul `Rusty' Russell
   * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
 - * (C) 2002-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + * (C) 2002-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
   * (C) 2006-2012 Patrick McHardy <kaber@trash.net>
-  *
-  * 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.
   */
  
  #include <linux/types.h>

diff --cc net/netfilter/nf_synproxy_core.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/netfilter/nft_ct.c
Simple merge

diff --cc net/netfilter/nft_dynset.c
Simple merge

diff --cc net/netfilter/nft_exthdr.c
Simple merge

diff --cc net/netfilter/xt_iprange.c
index 4ab4155,140ce6b..0c9e014
--- 1/net/netfilter/xt_iprange.c
--- 2/net/netfilter/xt_iprange.c
+++ b/net/netfilter/xt_iprange.c
@@@ -1,12 -2,8 +2,8 @@@
  /*
   *    xt_iprange - Netfilter module to match IP address ranges
   *
 - *    (C) 2003 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + *    (C) 2003 Jozsef Kadlecsik <kadlec@netfilter.org>
   *    (C) CC Computer Consultants GmbH, 2008
-  *
-  *    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.
   */
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  #include <linux/module.h>

diff --cc net/netfilter/xt_owner.c
Simple merge

diff --cc net/netfilter/xt_set.c
index f025c51,f099228..ecbfa29
--- 1/net/netfilter/xt_set.c
--- 2/net/netfilter/xt_set.c
+++ b/net/netfilter/xt_set.c
@@@ -1,11 -2,7 +2,7 @@@
  /* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
   *                         Patrick Schaaf <bof@bof.de>
   *                         Martin Josefsson <gandalf@wlug.westbo.se>
 - * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
-  *
-  * 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.
   */
  
  /* Kernel module which implements the set match and SET target