David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05:00
..
ipset	netfilter: ipset: Explicitly add padding elements to hash:net, net and hash:net, port, net	2014-12-03 12:43:36 +01:00
ipvs	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
core.c	netfilter: fix various sparse warnings	2014-11-13 12:14:42 +01:00
Kconfig	netfilter: Don't hide NETFILTER_XT_MATCH_ADDRTYPE behind NETFILTER_ADVANCED	2015-02-11 16:09:29 +01:00
Makefile	netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module	2014-11-27 13:08:42 +01:00
nf_conntrack_acct.c
nf_conntrack_amanda.c	net: Remove state argument from skb_find_text()	2015-02-22 15:59:54 -05:00
nf_conntrack_broadcast.c
nf_conntrack_core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2015-01-15 01:50:25 -05:00
nf_conntrack_ecache.c
nf_conntrack_expect.c
nf_conntrack_extend.c
nf_conntrack_ftp.c	netfilter: replace strnicmp with strncasecmp	2014-10-14 02:18:24 +02:00
nf_conntrack_h323_asn1.c
nf_conntrack_h323_main.c	netfilter: nf_conntrack_h323: lookup route from proper net namespace	2014-11-17 12:47:14 +01:00
nf_conntrack_h323_types.c
nf_conntrack_helper.c	netfilter: fix spelling errors	2014-10-30 17:35:30 +01:00
nf_conntrack_irc.c
nf_conntrack_l3proto_generic.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_labels.c
nf_conntrack_netbios_ns.c
nf_conntrack_netlink.c	netfilter: conntrack: Flush connections with a given mark	2015-01-08 12:14:20 +01:00
nf_conntrack_pptp.c
nf_conntrack_proto.c
nf_conntrack_proto_dccp.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_generic.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_gre.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_sctp.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_tcp.c	Merge branch 'iov_iter' into for-next	2014-12-08 20:39:29 -05:00
nf_conntrack_proto_udp.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_udplite.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_sane.c
nf_conntrack_seqadj.c	netfilter: nf_ct_seqadj: print ack seq in the right host byte order	2015-01-05 13:52:20 +01:00
nf_conntrack_sip.c	netfilter: replace strnicmp with strncasecmp	2014-10-14 02:18:24 +02:00
nf_conntrack_snmp.c
nf_conntrack_standalone.c	netfilter: Remove checks of seq_printf() return values	2014-11-05 14:11:02 -05:00
nf_conntrack_tftp.c
nf_conntrack_timeout.c
nf_conntrack_timestamp.c
nf_internals.h
nf_log.c	netfilter: log: remove unnecessary sizeof(char)	2014-12-23 14:33:58 +01:00
nf_log_common.c
nf_nat_amanda.c
nf_nat_core.c
nf_nat_ftp.c
nf_nat_helper.c
nf_nat_irc.c
nf_nat_proto_common.c
nf_nat_proto_dccp.c
nf_nat_proto_sctp.c
nf_nat_proto_tcp.c
nf_nat_proto_udp.c
nf_nat_proto_udplite.c
nf_nat_proto_unknown.c
nf_nat_redirect.c	netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module	2014-11-27 13:08:42 +01:00
nf_nat_sip.c	netfilter: replace strnicmp with strncasecmp	2014-10-14 02:18:24 +02:00
nf_nat_tftp.c
nf_queue.c
nf_sockopt.c
nf_synproxy_core.c
nf_tables_api.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
nf_tables_core.c
nf_tables_inet.c
nfnetlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2015-01-15 01:50:25 -05:00
nfnetlink_acct.c
nfnetlink_cthelper.c	netfilter: nfnetlink_cthelper: Remove 'const' and '&' to avoid warnings	2015-01-05 12:42:54 +01:00
nfnetlink_cttimeout.c
nfnetlink_log.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2014-11-24 16:00:58 -05:00
nfnetlink_queue_core.c	Merge branch 'iov_iter' into for-next	2014-12-08 20:39:29 -05:00
nfnetlink_queue_ct.c
nft_bitwise.c
nft_byteorder.c
nft_cmp.c
nft_compat.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
nft_counter.c
nft_ct.c
nft_expr_template.c
nft_exthdr.c
nft_hash.c	rhashtable: remove indirection for grow/shrink decision functions	2015-02-27 16:06:02 -05:00
nft_immediate.c
nft_limit.c
nft_log.c
nft_lookup.c	netfilter: nft_lookup: add missing attribute validation for NFTA_LOOKUP_SET_ID	2015-01-30 19:08:20 +01:00
nft_masq.c	netfilter: nf_tables: validate hooks in NAT expressions	2015-01-19 14:52:39 +01:00
nft_meta.c	netfilter: nft_meta: add cgroup support	2014-11-09 16:21:22 +01:00
nft_nat.c	netfilter: nf_tables: validate hooks in NAT expressions	2015-01-19 14:52:39 +01:00
nft_payload.c
nft_queue.c
nft_rbtree.c
nft_redir.c	netfilter: nf_tables: validate hooks in NAT expressions	2015-01-19 14:52:39 +01:00
nft_reject.c
nft_reject_inet.c
x_tables.c	netfilter: Remove checks of seq_printf() return values	2014-11-05 14:11:02 -05:00
xt_addrtype.c
xt_AUDIT.c
xt_bpf.c
xt_cgroup.c
xt_CHECKSUM.c
xt_CLASSIFY.c
xt_cluster.c
xt_comment.c
xt_connbytes.c
xt_connlabel.c
xt_connlimit.c	netfilter: xt_connlimit: honor conntrack zone if available	2014-11-17 12:44:20 +01:00
xt_connmark.c
xt_CONNSECMARK.c
xt_conntrack.c
xt_cpu.c
xt_CT.c
xt_dccp.c
xt_devgroup.c
xt_dscp.c
xt_DSCP.c	netfilter: fix various sparse warnings	2014-11-13 12:14:42 +01:00
xt_ecn.c
xt_esp.c
xt_hashlimit.c	netfilter: Remove checks of seq_printf() return values	2014-11-05 14:11:02 -05:00
xt_helper.c
xt_hl.c
xt_HL.c
xt_HMARK.c
xt_IDLETIMER.c
xt_ipcomp.c
xt_iprange.c
xt_ipvs.c
xt_l2tp.c
xt_LED.c
xt_length.c
xt_limit.c
xt_LOG.c
xt_mac.c
xt_mark.c
xt_multiport.c
xt_nat.c
xt_NETMAP.c
xt_nfacct.c
xt_NFLOG.c
xt_NFQUEUE.c
xt_osf.c	netfilter: xt_osf: Use continue to reduce indentation	2014-12-23 14:20:10 +01:00
xt_owner.c
xt_physdev.c
xt_pkttype.c
xt_policy.c
xt_quota.c
xt_RATEEST.c
xt_rateest.c
xt_realm.c
xt_recent.c	netfilter: xt_recent: don't reject rule if new hitcount exceeds table max	2015-02-16 17:00:47 +01:00
xt_REDIRECT.c	netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module	2014-11-27 13:08:42 +01:00
xt_repldata.h
xt_sctp.c
xt_SECMARK.c
xt_set.c	netfilter: ipset: fix boolreturn.cocci warnings	2015-02-11 16:13:30 +01:00
xt_socket.c	netfilter: xt_socket: fix a stack corruption bug	2015-02-16 17:00:48 +01:00
xt_state.c
xt_statistic.c
xt_string.c	net: Remove state argument from skb_find_text()	2015-02-22 15:59:54 -05:00
xt_TCPMSS.c
xt_tcpmss.c
xt_TCPOPTSTRIP.c
xt_tcpudp.c
xt_TEE.c
xt_time.c
xt_TPROXY.c
xt_TRACE.c
xt_u32.c