Pablo Neira Ayuso f0a0a978b6 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ...

This merge resolves conflicts with 75aec9df3a ("bridge: Remove
br_nf_push_frag_xmit_sk") as part of Eric Biederman's effort to improve
netns support in the network stack that reached upstream via David's
net-next tree.

Signed-off-by: Pablo Neira Ayuso <[email protected]>

Conflicts:
	net/bridge/br_netfilter_hooks.c

2015-10-17 14:28:03 +02:00

..

ipv4

ipv4: Push struct net down into nf_send_reset

2015-09-29 20:21:31 +02:00

ipv6

ipv6: Pass struct net into nf_ct_frag6_gather

2015-10-12 19:44:17 -07:00

br_netfilter.h

bridge: Pass net into br_validate_ipv4 and br_validate_ipv6

2015-09-29 20:21:32 +02:00

nf_conntrack_acct.h

…

nf_conntrack_core.h

netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple

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

nf_conntrack_ecache.h

…

nf_conntrack_expect.h

netfilter: nf_conntrack: push zone object into functions

2015-08-11 12:29:01 +02:00

nf_conntrack_extend.h

…

nf_conntrack_helper.h

…

nf_conntrack_l3proto.h

netfilter: Convert print_tuple functions to return void

2014-11-05 14:10:33 -05:00

nf_conntrack_l4proto.h

netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple

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

nf_conntrack_labels.h

netfilter: connlabels: Export setting connlabel length

2015-08-27 11:40:43 -07:00

nf_conntrack_seqadj.h

…

nf_conntrack_synproxy.h

…

nf_conntrack_timeout.h

netfilter: conntrack: fix crash on timeout object removal

2015-10-12 17:04:34 +02:00

nf_conntrack_timestamp.h

…

nf_conntrack_tuple.h

…

nf_conntrack_zones.h

netfilter: nf_conntrack: make nf_ct_zone_dflt built-in

2015-09-02 16:32:56 -07:00

nf_conntrack.h

netfilter: remove dead code

2015-10-05 17:32:01 +02:00

nf_log.h

netfilter: restore rule tracing via nfnetlink_log

2015-03-19 11:14:48 +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

…

nf_nat_redirect.h

netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module

2014-11-27 13:08:42 +01:00

nf_nat.h

netfilter: fix compilation of masquerading without IP_NF_TARGET_MASQUERADE

2014-09-11 17:02:45 +02:00

nf_queue.h

netfilter: make nf_queue_entry_get_refs return void

2015-10-16 18:22:23 +02:00

nf_tables_bridge.h

netfilter: nf_tables_bridge: export nft_reject_ip*hdr_validate functions

2014-11-27 12:58:05 +01:00

nf_tables_core.h

netfilter: nf_tables: add support for dynamic set updates

2015-04-08 16:58:27 +02:00

nf_tables_ipv4.h

netfilter: nf_tables: kill nft_pktinfo.ops

2015-09-18 21:58:01 +02:00

nf_tables_ipv6.h

netfilter: nf_tables: kill nft_pktinfo.ops

2015-09-18 21:58:01 +02:00

nf_tables.h

netfilter: Pass priv instead of nf_hook_ops to netfilter hooks

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

nfnetlink_log.h

…

nft_dup.h

netfilter: nf_tables: add nft_dup expression

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

nft_masq.h

netfilter: nf_tables: restrict nat/masq expressions to nat chain type

2014-10-13 20:42:00 +02:00

nft_meta.h

netfilter: nf_tables: get rid of NFT_REG_VERDICT usage

2015-04-13 17:17:07 +02:00

nft_redir.h

netfilter: nf_tables: add new expression nft_redir

2014-10-27 22:49:39 +01:00

nft_reject.h

netfilter: nft_reject: introduce icmp code abstraction for inet and bridge

2014-10-02 18:29:57 +02:00

xt_rateest.h

…