]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a1f8a2a 760ad8a)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 24 Jun 2019 23:32:59 +0000 (01:32 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 24 Jun 2019 23:32:59 +0000 (01:32 +0200)
commit5ae4f3e63e5d6ed259bb56b9171a6cd630c74493
treea645a1a2f7aea7faafcd67c6ba1bfd424b95cd7dtree | snapshot
parenta1f8a2a468bb7d8b5c845080d19c85910c0086e3commit | diff
parent760ad8a1e9c5709753b7d3955a476a26118d63b6commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

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

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
41 files changed:
CREDITS diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
include/linux/netfilter/ipset/ip_set.h diff1 | diff2 | blob | history
include/linux/netfilter/ipset/ip_set_counter.h diff1 | diff2 | blob | history
include/linux/netfilter/ipset/ip_set_skbinfo.h diff1 | diff2 | blob | history
include/linux/netfilter/ipset/ip_set_timeout.h diff1 | diff2 | blob | history
net/bridge/br_netfilter_hooks.c diff1 | diff2 | blob | history
net/bridge/br_netfilter_ipv6.c diff1 | diff2 | blob | history
net/ipv4/netfilter/ipt_SYNPROXY.c diff1 | diff2 | blob | history
net/ipv4/netfilter/nf_nat_h323.c diff1 | diff2 | blob | history
net/ipv6/netfilter/ip6t_SYNPROXY.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_bitmap_gen.h diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_bitmap_ip.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_bitmap_ipmac.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_bitmap_port.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_core.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_getport.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_hash_gen.h diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_hash_ip.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_hash_ipmark.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_hash_ipport.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_hash_ipportip.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_hash_ipportnet.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_hash_mac.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_hash_net.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_hash_netiface.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_hash_netnet.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_hash_netport.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_hash_netportnet.c diff1 | diff2 | blob | history
net/netfilter/ipset/ip_set_list_set.c diff1 | diff2 | blob | history
net/netfilter/nf_conntrack_core.c diff1 | diff2 | blob | history
net/netfilter/nf_conntrack_h323_main.c diff1 | diff2 | blob | history
net/netfilter/nf_conntrack_proto_tcp.c diff1 | diff2 | blob | history
net/netfilter/nf_synproxy_core.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_api.c diff1 | diff2 | blob | history
net/netfilter/nft_ct.c diff1 | diff2 | blob | history
net/netfilter/nft_dynset.c diff1 | diff2 | blob | history
net/netfilter/nft_exthdr.c diff1 | diff2 | blob | history
net/netfilter/xt_iprange.c diff1 | diff2 | blob | history
net/netfilter/xt_owner.c diff1 | diff2 | blob | history
net/netfilter/xt_set.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.