Hi Stephen, Sorry, that was my fault. When reviewing and applying the patches in my tree, I skipped d2912cb15bdd as "comments only" and then forgot about it. Best regards, Jozsef On Mon, 24 Jun 2019, Stephen Rothwell wrote: > 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. > > -- > 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 <gozem@xxxxxxxx> > * Patrick Schaaf <bof@xxxxxx> > * Martin Josefsson <gandalf@xxxxxxxxxxxxxx> > - * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx> > + * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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 > > - /* Copyright (C) 2015 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2015 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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. > */ > > #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 > > - /* Copyright (C) 2015 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2015 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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. > */ > > #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 > > - /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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. > */ > > #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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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_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 <gozem@xxxxxxxx> > * Patrick Schaaf <bof@xxxxxx> > - * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx> > + * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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 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 <gozem@xxxxxxxx> > * Patrick Schaaf <bof@xxxxxx> > * Martin Josefsson <gandalf@xxxxxxxxxxxxxx> > - * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx> > + * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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,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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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: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 <gozem@xxxxxxxx> > * Patrick Schaaf <bof@xxxxxx> > - * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx> > + * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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 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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2003-2011 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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 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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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_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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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: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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > * Copyright (C) 2013 Smoothwall Ltd. <vytas.dauksa@xxxxxxxxxxxxxx> > - * > - * 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: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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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: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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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: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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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: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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2014 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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: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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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_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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2011-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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,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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > * Copyright (C) 2013 Oliver Smith <oliver@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> > - * > - * 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 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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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,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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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: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 <kadlec@xxxxxxxxxxxxxxxxx> > + /* Copyright (C) 2008-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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 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 <gozem@xxxxxxxx> > * Patrick Schaaf <bof@xxxxxx> > * Martin Josefsson <gandalf@xxxxxxxxxxxxxx> > - * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx> > + * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx> > - * > - * 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 > - E-mail : kadlec@xxxxxxxxxxxxxxxxx, kadlecsik.jozsef@xxxxxxxxxxxxx PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences H-1525 Budapest 114, POB. 49, Hungary