Pablo Neira Ayuso 1c5ba67d22 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ...

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

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

2019-06-25 01:32:59 +02:00

..

ipset

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

2019-06-25 01:32:59 +02:00

nf_conntrack_amanda.h

…

nf_conntrack_common.h

…

nf_conntrack_dccp.h

…

nf_conntrack_ftp.h

…

nf_conntrack_h323_asn1.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 484

2019-06-19 17:09:52 +02:00

nf_conntrack_h323_types.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 484

2019-06-19 17:09:52 +02:00

nf_conntrack_h323.h

…

nf_conntrack_irc.h

…

nf_conntrack_pptp.h

…

nf_conntrack_proto_gre.h

netfilter: conntrack: remove pkt_to_tuple callback

2019-01-18 15:02:34 +01:00

nf_conntrack_sane.h

…

nf_conntrack_sctp.h

…

nf_conntrack_sip.h

…

nf_conntrack_snmp.h

…

nf_conntrack_tcp.h

…

nf_conntrack_tftp.h

…

nf_conntrack_zones_common.h

…

nfnetlink_acct.h

…

nfnetlink_osf.h

netfilter: nft_osf: Add version option support

2019-04-08 23:27:12 +02:00

nfnetlink.h

…

x_tables.h

netfilter: make two functions static

2019-04-08 23:28:33 +02:00

xt_hashlimit.h

…

xt_physdev.h

…