David S. Miller 13091aa305 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Honestly all the conflicts were simple overlapping changes, nothing really interesting to report. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-06-17 20:20:36 -07:00
..
ipset	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
ipvs	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
core.c	netfilter: replace skb_make_writable with skb_ensure_writable	2019-05-31 18:02:48 +02:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile
nf_conncount.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
nf_conntrack_acct.c
nf_conntrack_amanda.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
nf_conntrack_broadcast.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-07 11:00:14 -07:00
nf_conntrack_core.c
nf_conntrack_ecache.c
nf_conntrack_expect.c
nf_conntrack_extend.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
nf_conntrack_ftp.c
nf_conntrack_h323_asn1.c
nf_conntrack_h323_main.c
nf_conntrack_h323_types.c
nf_conntrack_helper.c
nf_conntrack_irc.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
nf_conntrack_labels.c
nf_conntrack_netbios_ns.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
nf_conntrack_netlink.c
nf_conntrack_pptp.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
nf_conntrack_proto.c	netfilter: nf_conntrack_bridge: register inet conntrack for bridge	2019-05-30 14:18:18 -07:00
nf_conntrack_proto_dccp.c
nf_conntrack_proto_generic.c
nf_conntrack_proto_gre.c	treewide: Add SPDX license identifier for missed files	2019-05-21 10:50:45 +02:00
nf_conntrack_proto_icmp.c
nf_conntrack_proto_icmpv6.c
nf_conntrack_proto_sctp.c	netfilter: conntrack, nat: prefer skb_ensure_writable	2019-05-31 18:02:45 +02:00
nf_conntrack_proto_tcp.c
nf_conntrack_proto_udp.c
nf_conntrack_sane.c
nf_conntrack_seqadj.c	netfilter: conntrack, nat: prefer skb_ensure_writable	2019-05-31 18:02:45 +02:00
nf_conntrack_sip.c
nf_conntrack_snmp.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
nf_conntrack_standalone.c
nf_conntrack_tftp.c
nf_conntrack_timeout.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 77	2019-05-24 17:37:51 +02:00
nf_conntrack_timestamp.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 77	2019-05-24 17:37:51 +02:00
nf_dup_netdev.c
nf_flow_table_core.c	netfilter: nf_flow_table: remove unnecessary variable in flow_offload_tuple	2019-05-31 18:02:42 +02:00
nf_flow_table_inet.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
nf_flow_table_ip.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2019-05-23 14:45:36 -07:00
nf_internals.h
nf_log.c	treewide: Add SPDX license identifier for missed files	2019-05-21 10:50:45 +02:00
nf_log_common.c
nf_log_netdev.c
nf_nat_amanda.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
nf_nat_core.c
nf_nat_ftp.c
nf_nat_helper.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2019-06-01 16:21:19 -07:00
nf_nat_irc.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
nf_nat_masquerade.c
nf_nat_proto.c	netfilter: conntrack, nat: prefer skb_ensure_writable	2019-05-31 18:02:45 +02:00
nf_nat_redirect.c	net: ipv4: provide __rcu annotation for ifa_list	2019-06-02 18:08:36 -07:00
nf_nat_sip.c	netfilter: ipv4: prefer skb_ensure_writable	2019-05-31 18:02:46 +02:00
nf_nat_tftp.c
nf_queue.c	netfilter: nf_queue: fix reinject verdict handling	2019-05-21 16:10:30 +02:00
nf_sockopt.c
nf_synproxy_core.c	netfilter: replace skb_make_writable with skb_ensure_writable	2019-05-31 18:02:48 +02:00
nf_tables_api.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2019-06-01 16:21:19 -07:00
nf_tables_core.c
nf_tables_set_core.c
nf_tables_trace.c
nfnetlink.c
nfnetlink_acct.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 77	2019-05-24 17:37:51 +02:00
nfnetlink_cthelper.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 77	2019-05-24 17:37:51 +02:00
nfnetlink_cttimeout.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 77	2019-05-24 17:37:51 +02:00
nfnetlink_log.c
nfnetlink_osf.c	netfilter: use in_dev_for_each_ifa_rcu	2019-06-02 18:06:26 -07:00
nfnetlink_queue.c	netfilter: replace skb_make_writable with skb_ensure_writable	2019-05-31 18:02:48 +02:00
nft_bitwise.c
nft_byteorder.c
nft_chain_filter.c
nft_chain_nat.c
nft_chain_route.c
nft_cmp.c
nft_compat.c
nft_connlimit.c
nft_counter.c
nft_ct.c
nft_dup_netdev.c
nft_dynset.c
nft_exthdr.c	netfilter: nf_tables: prefer skb_ensure_writable	2019-05-31 18:02:46 +02:00
nft_fib.c	netfilter: nft_fib: Fix existence check support	2019-05-21 16:10:38 +02:00
nft_fib_inet.c
nft_fib_netdev.c
nft_flow_offload.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2019-05-23 14:45:36 -07:00
nft_fwd_netdev.c
nft_hash.c
nft_immediate.c
nft_limit.c
nft_log.c
nft_lookup.c
nft_masq.c
nft_meta.c
nft_nat.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422	2019-06-05 17:37:15 +02:00
nft_numgen.c
nft_objref.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 422	2019-06-05 17:37:15 +02:00
nft_osf.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
nft_payload.c	netfilter: nf_tables: prefer skb_ensure_writable	2019-05-31 18:02:46 +02:00
nft_queue.c
nft_quota.c
nft_range.c
nft_redir.c
nft_reject.c
nft_reject_inet.c
nft_rt.c
nft_set_bitmap.c
nft_set_hash.c
nft_set_rbtree.c
nft_socket.c
nft_tproxy.c
nft_tunnel.c
nft_xfrm.c
utils.c
x_tables.c
xt_addrtype.c
xt_AUDIT.c
xt_bpf.c
xt_cgroup.c
xt_CHECKSUM.c
xt_CLASSIFY.c
xt_cluster.c
xt_comment.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
xt_connbytes.c
xt_connlabel.c
xt_connlimit.c
xt_connmark.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
xt_CONNSECMARK.c
xt_conntrack.c
xt_cpu.c
xt_CT.c
xt_dccp.c
xt_devgroup.c
xt_DSCP.c	netfilter: replace skb_make_writable with skb_ensure_writable	2019-05-31 18:02:48 +02:00
xt_dscp.c
xt_ecn.c
xt_esp.c
xt_hashlimit.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
xt_helper.c
xt_hl.c
xt_HL.c	netfilter: xt_HL: prefer skb_ensure_writable	2019-05-31 18:02:47 +02:00
xt_HMARK.c
xt_IDLETIMER.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 336	2019-06-05 17:37:07 +02:00
xt_ipcomp.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
xt_iprange.c
xt_ipvs.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
xt_l2tp.c
xt_LED.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 164	2019-05-30 11:26:38 -07:00
xt_length.c
xt_limit.c
xt_LOG.c
xt_mac.c
xt_mark.c
xt_MASQUERADE.c
xt_multiport.c
xt_nat.c
xt_NETMAP.c
xt_nfacct.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 72	2019-05-24 17:36:47 +02:00
xt_NFLOG.c
xt_NFQUEUE.c
xt_osf.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13	2019-05-21 11:28:45 +02:00
xt_owner.c	netfilter: xt_owner: Add supplementary groups option	2019-05-31 18:02:41 +02:00
xt_physdev.c
xt_pkttype.c
xt_policy.c
xt_quota.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
xt_RATEEST.c
xt_rateest.c
xt_realm.c
xt_recent.c
xt_REDIRECT.c
xt_repldata.h
xt_sctp.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
xt_SECMARK.c
xt_set.c
xt_socket.c
xt_state.c
xt_statistic.c
xt_string.c
xt_TCPMSS.c	netfilter: tcpmss, optstrip: prefer skb_ensure_writable	2019-05-31 18:02:48 +02:00
xt_tcpmss.c
xt_TCPOPTSTRIP.c	netfilter: tcpmss, optstrip: prefer skb_ensure_writable	2019-05-31 18:02:48 +02:00
xt_tcpudp.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
xt_TEE.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 3	2019-05-21 11:28:40 +02:00
xt_time.c
xt_TPROXY.c
xt_TRACE.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00
xt_u32.c	treewide: Add SPDX license identifier for more missed files	2019-05-21 10:50:45 +02:00