David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
ipset	netfilter: ipset: allow a 0 netmask with hash_netiface type	2016-01-13 14:03:43 +01:00
ipvs	net: ip_tunnel: remove 'csum_help' argument to iptunnel_handle_offloads	2016-02-12 05:52:16 -05:00
Kconfig	netfilter: tee: select NF_DUP_IPV6 unconditionally	2016-02-08 12:58:28 +01:00
Makefile	netfilter: nf_tables: add forward expression to the netdev family	2016-01-04 17:48:38 +01:00
core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07:00
nf_conntrack_acct.c	…
nf_conntrack_amanda.c	…
nf_conntrack_broadcast.c	…
nf_conntrack_core.c	netfilter: conntrack: resched in nf_ct_iterate_cleanup	2016-02-01 00:15:26 +01:00
nf_conntrack_ecache.c	…
nf_conntrack_expect.c	netfilter: Set /proc/net entries owner to root in namespace	2015-11-25 13:54:09 +01:00
nf_conntrack_extend.c	…
nf_conntrack_ftp.c	netfilter: nf_ct_helper: define pr_fmt()	2016-01-04 17:48:51 +01:00
nf_conntrack_h323_asn1.c	…
nf_conntrack_h323_main.c	ipv6: Remove external dependency on rt6i_gateway and RTF_ANYCAST	2015-05-25 13:25:33 -04:00
nf_conntrack_h323_types.c	…
nf_conntrack_helper.c	netfilter: nf_conntrack: use safer way to lock all buckets	2016-01-20 14:15:31 +01:00
nf_conntrack_irc.c	netfilter: nf_ct_helper: define pr_fmt()	2016-01-04 17:48:51 +01:00
nf_conntrack_l3proto_generic.c	…
nf_conntrack_labels.c	netfilter: connlabels: Export setting connlabel length	2015-08-27 11:40:43 -07:00
nf_conntrack_netbios_ns.c	…
nf_conntrack_netlink.c	netfilter: nf_conntrack: use safer way to lock all buckets	2016-01-20 14:15:31 +01:00
nf_conntrack_pptp.c	netfilter: nf_conntrack: push zone object into functions	2015-08-11 12:29:01 +02:00
nf_conntrack_proto.c	…
nf_conntrack_proto_dccp.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
nf_conntrack_proto_generic.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
nf_conntrack_proto_gre.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
nf_conntrack_proto_sctp.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
nf_conntrack_proto_tcp.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
nf_conntrack_proto_udp.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
nf_conntrack_proto_udplite.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
nf_conntrack_sane.c	netfilter: nf_ct_helper: define pr_fmt()	2016-01-04 17:48:51 +01:00
nf_conntrack_seqadj.c	net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool	2015-08-17 21:33:06 -07:00
nf_conntrack_sip.c	netfilter: nf_ct_helper: define pr_fmt()	2016-01-04 17:48:51 +01:00
nf_conntrack_snmp.c	…
nf_conntrack_standalone.c	netfilter: Set /proc/net entries owner to root in namespace	2015-11-25 13:54:09 +01:00
nf_conntrack_tftp.c	netfilter: nf_ct_helper: define pr_fmt()	2016-01-04 17:48:51 +01:00
nf_conntrack_timeout.c	netfilter: cttimeout: add netns support	2015-12-14 12:48:58 +01:00
nf_conntrack_timestamp.c	…
nf_dup_netdev.c	netfilter: nf_tables: add packet duplication to the netdev family	2016-01-03 21:04:23 +01:00
nf_internals.h	netfilter: nf_queue: fix nf_queue_nf_hook_drop()	2015-07-23 16:17:58 +02:00
nf_log.c	netfilter: nf_log: wait for rcu grace after logger unregistration	2015-09-17 13:37:31 +02:00
nf_log_common.c	…
nf_nat_amanda.c	…
nf_nat_core.c	netfilter: Pass net into nf_xfrm_me_harder	2015-09-18 22:00:22 +02:00
nf_nat_ftp.c	…
nf_nat_helper.c	…
nf_nat_irc.c	…
nf_nat_proto_common.c	…
nf_nat_proto_dccp.c	net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool	2015-08-17 21:33:06 -07:00
nf_nat_proto_sctp.c	…
nf_nat_proto_tcp.c	net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool	2015-08-17 21:33:06 -07:00
nf_nat_proto_udp.c	net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool	2015-08-17 21:33:06 -07:00
nf_nat_proto_udplite.c	net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool	2015-08-17 21:33:06 -07:00
nf_nat_proto_unknown.c	…
nf_nat_redirect.c	netfilter: nf_nat_redirect: add missing NULL pointer check	2015-10-27 06:54:56 +01:00
nf_nat_sip.c	…
nf_nat_tftp.c	…
nf_queue.c	netfilter: nf_queue: remove rcu_read_lock calls	2015-10-16 18:22:41 +02:00
nf_sockopt.c	…
nf_synproxy_core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2015-09-05 21:57:42 -07:00
nf_tables_api.c	netfilter: nf_tables: Add new attributes into nft_set to store user data.	2016-01-08 13:25:08 +01:00
nf_tables_core.c	netfilter: nf_tables: fix nf_log_trace based tracing	2015-12-09 16:53:46 +01:00
nf_tables_inet.c	netfilter: nf_tables: release objects on netns destruction	2015-12-28 18:34:35 +01:00
nf_tables_netdev.c	netfilter: nf_tables_netdev: fix error path in module initialization	2016-01-18 13:53:37 +01:00
nf_tables_trace.c	netfilter: nf_tables: wrap tracing with a static key	2015-12-09 13:23:13 +01:00
nfnetlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
nfnetlink_acct.c	netfilter: nfnetlink: pass down netns pointer to call() and call_rcu()	2015-12-28 18:41:41 +01:00
nfnetlink_cthelper.c	netfilter: nfnetlink: pass down netns pointer to call() and call_rcu()	2015-12-28 18:41:41 +01:00
nfnetlink_cttimeout.c	netfilter: cttimeout: fix deadlock due to erroneous unlock/lock conversion	2016-02-01 00:15:28 +01:00
nfnetlink_log.c	nfnetlink: remove nfnetlink_alloc_skb	2016-02-18 11:42:19 -05:00
nfnetlink_queue.c	nfnetlink: Revert "nfnetlink: add support for memory mapped netlink"	2016-02-18 11:42:22 -05:00
nft_bitwise.c	…
nft_byteorder.c	netfilter: nft_byteorder: avoid unneeded le/be conversion steps	2016-01-13 14:02:59 +01:00
nft_cmp.c	…
nft_compat.c	netfilter: nfnetlink: pass down netns pointer to call() and call_rcu()	2015-12-28 18:41:41 +01:00
nft_counter.c	netfilter: nft_counter: fix erroneous return values	2016-02-08 13:05:02 +01:00
nft_ct.c	netfilter: nft_ct: keep counters away from CONFIG_NF_CONNTRACK_LABELS	2016-01-14 19:41:16 +01:00
nft_dup_netdev.c	netfilter: nf_tables: add packet duplication to the netdev family	2016-01-03 21:04:23 +01:00
nft_dynset.c	netfilter: nf_tables: add clone interface to expression operations	2015-11-10 23:47:32 +01:00
nft_exthdr.c	…
nft_fwd_netdev.c	netfilter: nf_tables: add forward expression to the netdev family	2016-01-04 17:48:38 +01:00
nft_hash.c	…
nft_immediate.c	…
nft_limit.c	netfilter: nft_limit: allow to invert matching criteria	2016-01-03 20:58:52 +01:00
nft_log.c	netfilter: nf_tables: Use pkt->net instead of computing net from the passed net_devices	2015-09-18 21:58:49 +02:00
nft_lookup.c	…
nft_masq.c	…
nft_meta.c	netfilter: meta: add support for setting skb->pkttype	2015-12-18 14:12:56 +01:00
nft_nat.c	…
nft_payload.c	netfilter: nft_payload: add packet mangling support	2015-11-25 13:54:51 +01:00
nft_queue.c	netfilter: nf_tables: kill nft_pktinfo.ops	2015-09-18 21:58:01 +02:00
nft_rbtree.c	…
nft_redir.c	…
nft_reject.c	…
nft_reject_inet.c	ipv4: Push struct net down into nf_send_reset	2015-09-29 20:21:31 +02:00
x_tables.c	netfilter: Set /proc/net entries owner to root in namespace	2015-11-25 13:54:09 +01:00
xt_AUDIT.c	…
xt_CHECKSUM.c	…
xt_CLASSIFY.c	…
xt_CONNSECMARK.c	…
xt_CT.c	netfilter: cttimeout: add netns support	2015-12-14 12:48:58 +01:00
xt_DSCP.c	…
xt_HL.c	…
xt_HMARK.c	…
xt_IDLETIMER.c	netfilter: IDLETIMER: fix lockdep warning	2015-07-13 17:23:25 +02:00
xt_LED.c	…
xt_LOG.c	netfilter: x_tables: Use par->net instead of computing from the passed net devices	2015-09-18 21:58:25 +02:00
xt_NETMAP.c	…
xt_NFLOG.c	netfilter: x_tables: Use par->net instead of computing from the passed net devices	2015-09-18 21:58:25 +02:00
xt_NFQUEUE.c	…
xt_RATEEST.c	…
xt_REDIRECT.c	…
xt_SECMARK.c	…
xt_TCPMSS.c	netfilter: xt_TCPMSS: handle CHECKSUM_COMPLETE in tcpmss_tg6()	2016-01-18 12:18:17 +01:00
xt_TCPOPTSTRIP.c	net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool	2015-08-17 21:33:06 -07:00
xt_TEE.c	netfilter: tee: select NF_DUP_IPV6 unconditionally	2016-02-08 12:58:28 +01:00
xt_TPROXY.c	inet: refactor inet[6]_lookup functions to take skb	2016-02-11 03:54:14 -05:00
xt_TRACE.c	…
xt_addrtype.c	netfilter: x_tables: Use par->net instead of computing from the passed net devices	2015-09-18 21:58:25 +02:00
xt_bpf.c	…
xt_cgroup.c	netfilter: implement xt_cgroup cgroup2 path match	2015-12-14 20:34:55 +01:00
xt_cluster.c	…
xt_comment.c	…
xt_connbytes.c	…
xt_connlabel.c	netfilter: connlabels: Export setting connlabel length	2015-08-27 11:40:43 -07:00
xt_connlimit.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
xt_connmark.c	…
xt_conntrack.c	…
xt_cpu.c	…
xt_dccp.c	…
xt_devgroup.c	…
xt_dscp.c	…
xt_ecn.c	…
xt_esp.c	…
xt_hashlimit.c	…
xt_helper.c	…
xt_hl.c	…
xt_ipcomp.c	…
xt_iprange.c	…
xt_ipvs.c	ipvs: Pass ipvs into conn_out_get	2015-09-24 09:34:41 +09:00
xt_l2tp.c	…
xt_length.c	…
xt_limit.c	…
xt_mac.c	…
xt_mark.c	netfilter: xt_MARK: Add ARP support	2015-05-14 13:00:27 +02:00
xt_multiport.c	…
xt_nat.c	…
xt_nfacct.c	netfilter: nfacct: per network namespace support	2015-08-07 11:50:56 +02:00
xt_osf.c	netfilter: nfnetlink: pass down netns pointer to call() and call_rcu()	2015-12-28 18:41:41 +01:00
xt_owner.c	netfilter: xt_owner: use skb_to_full_sk() helper	2015-11-08 20:56:39 -05:00
xt_physdev.c	…
xt_pkttype.c	…
xt_policy.c	…
xt_quota.c	…
xt_rateest.c	…
xt_realm.c	…
xt_recent.c	netfilter: x_tables: Use par->net instead of computing from the passed net devices	2015-09-18 21:58:25 +02:00
xt_repldata.h	…
xt_sctp.c	…
xt_set.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
xt_socket.c	inet: refactor inet[6]_lookup functions to take skb	2016-02-11 03:54:14 -05:00
xt_state.c	…
xt_statistic.c	…
xt_string.c	…
xt_tcpmss.c	…
xt_tcpudp.c	…
xt_time.c	…
xt_u32.c	…