From: Pablo Neira Ayuso Date: Mon, 24 Jun 2019 23:32:59 +0000 (+0200) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next X-Git-Tag: v5.3-rc1~140^2~153^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c5ba67d2277ac2faf37c61076e8b5fa312be492;p=thirdparty%2Flinux.git 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 --- 1c5ba67d2277ac2faf37c61076e8b5fa312be492 diff --cc include/linux/netfilter/ipset/ip_set.h index f5c6e7cd64698,f5e03809cdb29..12ad9b1853b4b --- a/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 * 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 305aeda2a8995,5477492c83742..3400958c07be5 --- a/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 - * - * 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 -- */ ++/* Copyright (C) 2015 Jozsef Kadlecsik */ #ifdef __KERNEL__ diff --cc include/linux/netfilter/ipset/ip_set_skbinfo.h index fac57ef854c24,aae081e085c63..3a2df02dbd551 --- a/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 - * - * 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 -- */ ++/* Copyright (C) 2015 Jozsef Kadlecsik */ #ifdef __KERNEL__ diff --cc include/linux/netfilter/ipset/ip_set_timeout.h index dc74150f34322,88926b4c75f04..2be60e379ecf5 --- a/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 - * - * 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 -- */ ++/* Copyright (C) 2003-2013 Jozsef Kadlecsik */ #ifdef __KERNEL__ diff --cc net/ipv4/netfilter/ipt_SYNPROXY.c index 0c80616c00b51,64d9563c0218f..8e7f84ec783da --- a/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 - * - * 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 -#include -#include - #include #include #include diff --cc net/ipv4/netfilter/nf_nat_h323.c index 076b6b29d66dc,f03340e75ce95..87b711fd5a442 --- a/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 * Copyright (c) 2006-2012 Patrick McHardy * - * This source code is licensed under General Public License version 2. - * * Based on the 'brute force' H.323 NAT module by - * Jozsef Kadlecsik + * Jozsef Kadlecsik */ #include diff --cc net/ipv6/netfilter/ip6t_SYNPROXY.c index 55a9b92d0a1f2,41325d5174787..e77ea1ed5eddd --- a/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 - * - * 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 -#include -#include -#include -#include - #include #include #include diff --cc net/netfilter/ipset/ip_set_bitmap_gen.h index 29c1e9a50601f,8acc4e173167b..063df74b46470 --- a/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 - * - * 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 - */ ++/* Copyright (C) 2013 Jozsef Kadlecsik */ #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 5a66c54997006,e3884b0cca912..11ff9d4a70063 --- a/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 * 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. */ /* Kernel module implementing an IP set type: the bitmap:ip type */ diff --cc net/netfilter/ipset/ip_set_bitmap_ipmac.c index ec7a8b12642c7,b73c37b3a791f..ca7ac4a25ada2 --- a/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 * Patrick Schaaf * Martin Josefsson - * 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. - * Copyright (C) 2003-2013 Jozsef Kadlecsik */ /* Kernel module implementing an IP set type: the bitmap:ip,mac type */ diff --cc net/netfilter/ipset/ip_set_bitmap_port.c index 18275ec4924c6,d8c1405533797..704a0dda16090 --- a/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 - * - * 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 - */ ++/* Copyright (C) 2003-2013 Jozsef Kadlecsik */ /* Kernel module implementing an IP set type: the bitmap:port type */ diff --cc net/netfilter/ipset/ip_set_core.c index 18430ad2fdf2d,3cdf171cd4682..2e151856ad999 --- a/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 * 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. */ /* Kernel module for IP set management */ diff --cc net/netfilter/ipset/ip_set_getport.c index dc7b46b413544,2384e36aef5cf..2b8f959574b44 --- a/net/netfilter/ipset/ip_set_getport.c +++ b/net/netfilter/ipset/ip_set_getport.c @@@ -1,8 -1,5 +1,9 @@@ + // 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. */ /* Get Layer-4 data from the packets */ diff --cc net/netfilter/ipset/ip_set_hash_gen.h index 07ef941130a6a,10f619625abde..0feb77fa9edce --- a/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 - * - * 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 - */ ++/* Copyright (C) 2013 Jozsef Kadlecsik */ #ifndef _IP_SET_HASH_GEN_H #define _IP_SET_HASH_GEN_H diff --cc net/netfilter/ipset/ip_set_hash_ip.c index 7b82bf1104ce0,69d7576be2e65..f4432d9fcad0d --- a/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 - * - * 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 - */ ++/* Copyright (C) 2003-2013 Jozsef Kadlecsik */ /* Kernel module implementing an IP set type: the hash:ip type */ diff --cc net/netfilter/ipset/ip_set_hash_ipmark.c index 7d468f98a2529,6fe1ec0d2154c..7a1734aad0c57 --- a/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 - * 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. - */ + // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (C) 2003-2013 Jozsef Kadlecsik - * Copyright (C) 2013 Smoothwall Ltd. - */ ++/* Copyright (C) 2003-2013 Jozsef Kadlecsik */ /* Kernel module implementing an IP set type: the hash:ip,mark type */ diff --cc net/netfilter/ipset/ip_set_hash_ipport.c index d358ee69d04bd,74ec7e097e34c..32e240658334f --- a/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 - * - * 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 - */ ++/* Copyright (C) 2003-2013 Jozsef Kadlecsik */ /* Kernel module implementing an IP set type: the hash:ip,port type */ diff --cc net/netfilter/ipset/ip_set_hash_ipportip.c index 0a304785f912d,ced57d63b01f2..15d4193531794 --- a/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 - * - * 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 - */ ++/* Copyright (C) 2003-2013 Jozsef Kadlecsik */ /* Kernel module implementing an IP set type: the hash:ip,port,ip type */ diff --cc net/netfilter/ipset/ip_set_hash_ipportnet.c index 245f7d7148704,905f6cf0f55e3..7a4d7afd41215 --- a/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 - * - * 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 - */ ++/* Copyright (C) 2003-2013 Jozsef Kadlecsik */ /* Kernel module implementing an IP set type: the hash:ip,port,net type */ diff --cc net/netfilter/ipset/ip_set_hash_mac.c index 3d1fc71dac387,853e772ab4d96..d94c585d33c5c --- a/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 - * - * 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 - */ ++/* Copyright (C) 2014 Jozsef Kadlecsik */ /* Kernel module implementing an IP set type: the hash:mac type */ diff --cc net/netfilter/ipset/ip_set_hash_net.c index 470701fda2311,06c91e49bf25d..c259cbc3ef453 --- a/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 - * - * 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 - */ ++/* Copyright (C) 2003-2013 Jozsef Kadlecsik */ /* Kernel module implementing an IP set type: the hash:net type */ diff --cc net/netfilter/ipset/ip_set_hash_netiface.c index 1df8656ad84d5,0a8cbcdfb42ba..87b29f971226f --- a/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 - * - * 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 - */ ++/* Copyright (C) 2011-2013 Jozsef Kadlecsik */ /* Kernel module implementing an IP set type: the hash:net,iface type */ diff --cc net/netfilter/ipset/ip_set_hash_netnet.c index e0553be89600c,832e4f5491cbf..a3ae69bfee668 --- a/net/netfilter/ipset/ip_set_hash_netnet.c +++ b/net/netfilter/ipset/ip_set_hash_netnet.c @@@ -1,9 -1,6 +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. */ /* Kernel module implementing an IP set type: the hash:net type */ diff --cc net/netfilter/ipset/ip_set_hash_netport.c index 943d55d76fcf4,a4f3f15b874a4..799f2272cc65b --- a/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 - * - * 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 - */ ++/* Copyright (C) 2003-2013 Jozsef Kadlecsik */ /* Kernel module implementing an IP set type: the hash:net,port type */ diff --cc net/netfilter/ipset/ip_set_hash_netportnet.c index afaff99e578cf,e54d415405f34..a82b70e8b9a63 --- a/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 - * - * 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 - */ ++/* Copyright (C) 2003-2013 Jozsef Kadlecsik */ /* Kernel module implementing an IP set type: the hash:ip,port,net type */ diff --cc net/netfilter/ipset/ip_set_list_set.c index ed4360072f649,8ada318bf09db..6f9ead6319e0d --- a/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 - * - * 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 - */ ++/* Copyright (C) 2008-2013 Jozsef Kadlecsik */ /* Kernel module implementing an IP set type: the list:set type */ diff --cc net/netfilter/nf_conntrack_h323_main.c index 1ff66e070cb2b,fac6986d37a8f..6497e5fc08710 --- a/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 * Copyright (c) 2006-2012 Patrick McHardy * - * This source code is licensed under General Public License version 2. - * * Based on the 'brute force' H.323 connection tracking module by - * Jozsef Kadlecsik + * Jozsef Kadlecsik * * For more information, please see http://nath323.sourceforge.net/ */ diff --cc net/netfilter/nf_conntrack_proto_tcp.c index 60b68400435dd,1e2cc83ff5da8..d5fdfa00d6830 --- a/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 - * (C) 2002-2013 Jozsef Kadlecsik + * (C) 2002-2013 Jozsef Kadlecsik * (C) 2006-2012 Patrick McHardy - * - * 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 diff --cc net/netfilter/xt_iprange.c index 4ab4155706d7e,140ce6be639af..0c9e014e30b49 --- a/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 + * (C) 2003 Jozsef Kadlecsik * (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 diff --cc net/netfilter/xt_set.c index f025c51ba3759,f099228cb9c43..ecbfa291fb70b --- a/net/netfilter/xt_set.c +++ b/net/netfilter/xt_set.c @@@ -1,11 -2,7 +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. */ /* Kernel module which implements the set match and SET target