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 <[email protected]>

diff --cc CREDITS
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc include/linux/netfilter/ipset/ip_set.h
index f5c6e7cd6469864208121fc596f5bf8c25d56aac,f5e03809cdb29dd7e80534613b2ad0575552a6cc..12ad9b1853b4b4db743a7aa8bd247424eaa94680
--- 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 <[email protected]>
   *                         Patrick Schaaf <[email protected]>
   *                         Martin Josefsson <[email protected]>
 - * 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 305aeda2a8995f0e4de8bc4d3e7f82ba4475ab98,5477492c8374236fb030d691bf04cc32ad56a392..3400958c07be573532034685dd2da62bc1782df6
--- 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 <[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.
 -/* Copyright (C) 2015 Jozsef Kadlecsik <[email protected]>
-- */
++/* Copyright (C) 2015 Jozsef Kadlecsik <[email protected]> */
  
  #ifdef __KERNEL__
  

diff --cc include/linux/netfilter/ipset/ip_set_skbinfo.h
index fac57ef854c24706cc8c3a2b999382dac0ce64b7,aae081e085c63338534e3f74c795616716fa1452..3a2df02dbd55178252fafa115a3fca1141d66c67
--- 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 <[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.
 -/* Copyright (C) 2015 Jozsef Kadlecsik <[email protected]>
-- */
++/* Copyright (C) 2015 Jozsef Kadlecsik <[email protected]> */
  
  #ifdef __KERNEL__
  

diff --cc include/linux/netfilter/ipset/ip_set_timeout.h
index dc74150f34322a98b44e47206a9b912d6b52c78a,88926b4c75f043b4139c383b114f2df2a1e3995a..2be60e379ecf55af9f621cd4e658bf57f76a5421
--- 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 <[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.
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]>
-- */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> */
  
  #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 0c80616c00b51ebdf117af29430d3eaa64b3dbfb,64d9563c0218f7170353a3a29e6869b9e481d719..8e7f84ec783da52e78a2f040a13f6bd60f2efee5
--- 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 <[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.
   */
  
 -#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 076b6b29d66dc3d150f591986cf48a4fca9866d2,f03340e75ce95efe4e5438827357fac26f968c04..87b711fd5a442633fc493dee2fcacc3ff34b9095
--- 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 <[email protected]>
   * Copyright (c) 2006-2012 Patrick McHardy <[email protected]>
   *
-  * 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 55a9b92d0a1f20ef1673f16cab4ffc15394a980e,41325d51747879a12e0dc44e2899c5e7589c878d..e77ea1ed5eddd41faeb5879c93879d0d29d6b903
--- 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 <[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.
   */
  
 -#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 29c1e9a50601f0240eb74fb22c4e7cd9d8e2b11e,8acc4e173167b2c87078aa95f6d83ab863eef07b..063df74b4647004b4279199d44e03fc765d7da47
--- 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 <[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.
-  */
+ /* SPDX-License-Identifier: GPL-2.0-only */
 -/* Copyright (C) 2013 Jozsef Kadlecsik <[email protected]>
 - */
++/* Copyright (C) 2013 Jozsef Kadlecsik <[email protected]> */
  
  #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 5a66c5499700658ce7b166f988fffba931574150,e3884b0cca912bd4f08a86726398cb8faf137a50..11ff9d4a70063bc8b730986abdce0cd79dafd27c
--- 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 <[email protected]>
   *                         Patrick Schaaf <[email protected]>
 - * 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 ec7a8b12642c70b48600263bddad596c01d65b56,b73c37b3a791f2d9a0dfa7a81077f3e94b51bf0f..ca7ac4a25ada2f1527175f03d204d90bedfea7ba
--- 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 <[email protected]>
   *                         Patrick Schaaf <[email protected]>
   *                       Martin Josefsson <[email protected]>
-  * Copyright (C) 2003-2013 Jozsef Kadlecsik <[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.
 - * Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]>
   */
  
  /* Kernel module implementing an IP set type: the bitmap:ip,mac type */

diff --cc net/netfilter/ipset/ip_set_bitmap_port.c
index 18275ec4924c6f2eebacdbfb985cf75ef6a8effd,d8c14055337977d77ace349a2b84a500e0d7e9fd..704a0dda16090aab2660105ef96a03a37003de76
--- 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 <[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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> */
  
  /* Kernel module implementing an IP set type: the bitmap:port type */
  

diff --cc net/netfilter/ipset/ip_set_core.c
index 18430ad2fdf2d75de19b2394c9a5ed0ea7d65d63,3cdf171cd4682e90a28758c30c561c9ba2a9c6fe..2e151856ad9992f1ec338f8fd6bed53b98c30be4
--- 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 <[email protected]>
   *                         Patrick Schaaf <[email protected]>
 - * 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 dc7b46b4135441cc2fa10d1b2399def0894e45aa,2384e36aef5cf2470fdbc9d3994c59ad130996af..2b8f959574b4475ab4231cee0f115f89e7d44113
--- 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 <[email protected]>
+ // SPDX-License-Identifier: GPL-2.0-only
 +/* Copyright (C) 2003-2011 Jozsef Kadlecsik <[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.
   */
  
  /* Get Layer-4 data from the packets */

diff --cc net/netfilter/ipset/ip_set_hash_gen.h
index 07ef941130a6ae12970061f5574224ab40f8b1a0,10f619625abdead9151a4fdf0dd1aa362438edd0..0feb77fa9edcee1fd51f6939d001b14c5d5be728
--- 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 <[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.
-  */
+ /* SPDX-License-Identifier: GPL-2.0-only */
 -/* Copyright (C) 2013 Jozsef Kadlecsik <[email protected]>
 - */
++/* Copyright (C) 2013 Jozsef Kadlecsik <[email protected]> */
  
  #ifndef _IP_SET_HASH_GEN_H
  #define _IP_SET_HASH_GEN_H

diff --cc net/netfilter/ipset/ip_set_hash_ip.c
index 7b82bf1104ce04ce5e87da9ab393df5e46c238e6,69d7576be2e6579068030d33495ca067e46ee93f..f4432d9fcad0dde2e832df706122f5dcddc08a33
--- 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 <[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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> */
  
  /* Kernel module implementing an IP set type: the hash:ip type */
  

diff --cc net/netfilter/ipset/ip_set_hash_ipmark.c
index 7d468f98a2529abe20df84457db5837fb1483cce,6fe1ec0d2154c11350bd4ff491d406f9037844c0..7a1734aad0c57c4cded438401af2fd9e824aa5e3
--- 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 <[email protected]>
-  * Copyright (C) 2013 Smoothwall Ltd. <[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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]>
 - * Copyright (C) 2013 Smoothwall Ltd. <[email protected]>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> */
  
  /* Kernel module implementing an IP set type: the hash:ip,mark type */
  

diff --cc net/netfilter/ipset/ip_set_hash_ipport.c
index d358ee69d04bd14290d94fa53a97a8baf88482fc,74ec7e097e34cdf3281886fe6213a706e792affc..32e240658334f338fcf02d67693bba805697fb52
--- 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 <[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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> */
  
  /* Kernel module implementing an IP set type: the hash:ip,port type */
  

diff --cc net/netfilter/ipset/ip_set_hash_ipportip.c
index 0a304785f912d220ef8b26f0ba28aff2e905707f,ced57d63b01f21cdcaf956f6d1fd7598e1f8bbbd..15d41935317940a6693f42c780951e8ba08a0820
--- 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 <[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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> */
  
  /* Kernel module implementing an IP set type: the hash:ip,port,ip type */
  

diff --cc net/netfilter/ipset/ip_set_hash_ipportnet.c
index 245f7d714870416e4e6b7177f6f5774e55088afe,905f6cf0f55e316d03e9f831c8252da9e1ee1baa..7a4d7afd4121580845a4a2d0668229b22b593841
--- 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 <[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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> */
  
  /* Kernel module implementing an IP set type: the hash:ip,port,net type */
  

diff --cc net/netfilter/ipset/ip_set_hash_mac.c
index 3d1fc71dac387ee5d3d70525c25c81d49ea7c59d,853e772ab4d962e000a78e31526cc048bf7cd5dd..d94c585d33c5c32d7ab93b9dbc79a6d8f4f5f190
--- 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 <[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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2014 Jozsef Kadlecsik <[email protected]>
 - */
++/* Copyright (C) 2014 Jozsef Kadlecsik <[email protected]> */
  
  /* Kernel module implementing an IP set type: the hash:mac type */
  

diff --cc net/netfilter/ipset/ip_set_hash_net.c
index 470701fda2311535e9b677e084e5d88ff9e8b5a3,06c91e49bf25d46e9dcb2d47798e6f0b3859b55f..c259cbc3ef453eaee5461e2b98fc3dc735d196ad
--- 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 <[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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> */
  
  /* Kernel module implementing an IP set type: the hash:net type */
  

diff --cc net/netfilter/ipset/ip_set_hash_netiface.c
index 1df8656ad84d5cae5b6f5282bf5259181bf9dcaf,0a8cbcdfb42ba48ae51488fc9675eb8806ae5584..87b29f971226f90d512c57bba4faf59c73e73ef3
--- 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 <[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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2011-2013 Jozsef Kadlecsik <[email protected]>
 - */
++/* Copyright (C) 2011-2013 Jozsef Kadlecsik <[email protected]> */
  
  /* Kernel module implementing an IP set type: the hash:net,iface type */
  

diff --cc net/netfilter/ipset/ip_set_hash_netnet.c
index e0553be89600c2ef3693f01b48801a55867fda26,832e4f5491cbf3f762a2f8798eea2250964d52bd..a3ae69bfee668466f276f5cdebb451048a7eb5e9
--- 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 <[email protected]>
+ // SPDX-License-Identifier: GPL-2.0-only
 +/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]>
   * Copyright (C) 2013 Oliver Smith <[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.
   */
  
  /* Kernel module implementing an IP set type: the hash:net type */

diff --cc net/netfilter/ipset/ip_set_hash_netport.c
index 943d55d76fcf4791dbec95bcb9d2b37b3467d8ec,a4f3f15b874a4f5402845564ff5a9ad14ceee543..799f2272cc65b5fb6161a626c41db7ffe68dd9e0
--- 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 <[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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> */
  
  /* Kernel module implementing an IP set type: the hash:net,port type */
  

diff --cc net/netfilter/ipset/ip_set_hash_netportnet.c
index afaff99e578cf4ac4f54613b8fa2db7b5de9f313,e54d415405f34e4dbdacbb411abf38dda3199a51..a82b70e8b9a631a143bfdf2ba642972386beec8d
--- 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 <[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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]>
 - */
++/* Copyright (C) 2003-2013 Jozsef Kadlecsik <[email protected]> */
  
  /* Kernel module implementing an IP set type: the hash:ip,port,net type */
  

diff --cc net/netfilter/ipset/ip_set_list_set.c
index ed4360072f649ea3f26d56caaef44c0770e4ac53,8ada318bf09dbb8865b63101ddc1e27649120791..6f9ead6319e0d840a64de28327b409399dcd8c73
--- 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 <[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.
-  */
+ // SPDX-License-Identifier: GPL-2.0-only
 -/* Copyright (C) 2008-2013 Jozsef Kadlecsik <[email protected]>
 - */
++/* Copyright (C) 2008-2013 Jozsef Kadlecsik <[email protected]> */
  
  /* 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 1ff66e070cb2b9129591bd1e6a6d88589faf3840,fac6986d37a8f04140ad7d5a33d99d9e61c02bdc..6497e5fc087101b4dc7664616f113e0c4857ce70
--- 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 <[email protected]>
   * Copyright (c) 2006-2012 Patrick McHardy <[email protected]>
   *
-  * 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 60b68400435dd9216a2a5f1df50cced8cf1387e0,1e2cc83ff5da8378ceecd695039c22955052711e..d5fdfa00d683098d53d14a1932ef6d8224283d32
--- 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 <[email protected]>
 - * (C) 2002-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 + * (C) 2002-2013 Jozsef Kadlecsik <kadlec@netfilter.org>
   * (C) 2006-2012 Patrick McHardy <[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.
   */
  
  #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 4ab4155706d7e0167cef809f5b429b2e21e91aef,140ce6be639af9a8b532a80c1a370b3c028c2695..0c9e014e30b494ca19363f244d5aa8290645fd12
--- 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 f025c51ba3759fa5734e71c65b6991137b0db9e4,f099228cb9c43baa75c69db9be397d768c32c921..ecbfa291fb70bcacff496fd5ba9a43f5dd822ba3
--- 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 <[email protected]>
   *                         Patrick Schaaf <[email protected]>
   *                         Martin Josefsson <[email protected]>
 - * 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