David S. Miller 16ae1f2236 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmmii.c
	drivers/net/hyperv/netvsc.c
	kernel/bpf/hashtab.c

Almost entirely overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-03-23 16:41:27 -07:00

..

ipv4

netfilter: merge udp and udplite conntrack helpers

2017-01-03 14:33:25 +01:00

ipv6

netfilter: merge udp and udplite conntrack helpers

2017-01-03 14:33:25 +01:00

br_netfilter.h

netfilter: bridge: add and use br_nf_hook_thresh

2016-09-24 21:25:48 +02:00

nf_conntrack_acct.h

…

nf_conntrack_core.h

skbuff: add and use skb_nfct helper

2017-02-02 14:31:53 +01:00

nf_conntrack_ecache.h

netfilter: don't rely on DYING bit to detect when destroy event was sent

2016-08-30 11:43:08 +02:00

nf_conntrack_expect.h

netfilter: refcounter conversions

2017-03-17 12:49:43 +01:00

nf_conntrack_extend.h

netfilter: move nat hlist_head to nf_conn

2016-07-11 11:47:50 +02:00

nf_conntrack_helper.h

netfilter: Add helper array register/unregister functions

2016-07-21 02:31:53 +02:00

nf_conntrack_l3proto.h

netfilter: conntrack: add nf_conntrack_default_on sysctl

2016-12-04 21:17:25 +01:00

nf_conntrack_l4proto.h

netfilter: conntrack: no need to pass ctinfo to error handler

2017-02-02 14:31:51 +01:00

nf_conntrack_labels.h

netfilter: conntrack: avoid excess memory allocation

2016-10-27 18:29:02 +02:00

nf_conntrack_seqadj.h

…

nf_conntrack_synproxy.h

netns: make struct pernet_operations::id unsigned int

2016-11-18 10:59:15 -05:00

nf_conntrack_timeout.h

netfilter: refcounter conversions

2017-03-17 12:49:43 +01:00

nf_conntrack_timestamp.h

…

nf_conntrack_tuple.h

…

nf_conntrack_zones.h

netfilter: move zone info into struct nf_conn

2016-06-23 13:33:12 +02:00

nf_conntrack.h

netfilter: Force fake conntrack entry to be at least 8 bytes aligned

2017-03-13 13:33:58 +01:00

nf_dup_netdev.h

netfilter: add and use nf_fwd_netdev_egress

2016-12-06 21:48:22 +01:00

nf_log.h

netfilter: allow logging from non-init namespaces

2017-02-02 14:31:58 +01:00

nf_nat_core.h

netfilter: Pass net into nf_xfrm_me_harder

2015-09-18 22:00:22 +02:00

nf_nat_helper.h

…

nf_nat_l3proto.h

netfilter: Pass priv instead of nf_hook_ops to netfilter hooks

2015-09-18 22:00:16 +02:00

nf_nat_l4proto.h

netfilter: built-in NAT support for UDPlite

2016-12-04 20:45:32 +01:00

nf_nat_redirect.h

…

nf_nat.h

netfilter: nat: convert nat bysrc hash to rhashtable

2016-07-11 12:07:57 +02:00

nf_queue.h

netfilter: remove hook_entries field from nf_hook_state

2016-11-03 11:52:58 +01:00

nf_socket.h

netfilter: move socket lookup infrastructure to nf_socket_ipv{4,6}.c

2016-11-01 20:50:31 +01:00

nf_tables_core.h

netfilter: nft_payload: layer 4 checksum adjustment for pseudoheader fields

2016-12-06 21:47:54 +01:00

nf_tables_ipv4.h

netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"

2016-10-05 20:25:48 -04:00

nf_tables_ipv6.h

netfilter: nf_tables: set pktinfo->thoff at AH header if found

2017-03-08 18:35:27 +01:00

nf_tables.h

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

2017-03-23 16:41:27 -07:00

nfnetlink_log.h

…

nft_dup.h

netfilter: nf_tables: add nft_dup expression

2015-08-07 11:49:49 +02:00

nft_fib.h

netfilter: nft_fib: Support existence check

2017-03-13 13:45:36 +01:00

nft_masq.h

netfilter: nft_masq: support port range

2016-03-02 20:05:27 +01:00

nft_meta.h

netfilter: nft_meta: improve the validity check of pkttype set expr

2016-08-25 13:12:03 +02:00

nft_redir.h

…

nft_reject.h

netfilter: nft_reject: restrict to INPUT/FORWARD/OUTPUT

2016-08-25 12:55:34 +02:00

xt_rateest.h

net_sched: gen_estimator: complete rewrite of rate estimators

2016-12-05 15:21:59 -05:00