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

Conflicts:
	net/ipv6/xfrm6_output.c
	net/openvswitch/flow_netlink.c
	net/openvswitch/vport-gre.c
	net/openvswitch/vport-vxlan.c
	net/openvswitch/vport.c
	net/openvswitch/vport.h

The openvswitch conflicts were overlapping changes.  One was
the egress tunnel info fix in 'net' and the other was the
vport ->send() op simplification in 'net-next'.

The xfrm6_output.c conflicts was also a simplification
overlapping a bug fix.

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

2015-10-24 06:54:12 -07:00

..

ipset

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

2015-10-24 06:54:12 -07:00

ipvs

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

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

core.c

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

2015-10-24 06:54:12 -07:00

Kconfig

netfilter: nfnetlink_log: allow to attach conntrack

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

Makefile

netfilter: rename nfnetlink_queue_core.c to nfnetlink_queue.c

2015-10-04 21:45:44 +02:00

nf_conntrack_acct.c

…

nf_conntrack_amanda.c

…

nf_conntrack_broadcast.c

…

nf_conntrack_core.c

netfilter: conntrack: fix crash on timeout object removal

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

nf_conntrack_ecache.c

…

nf_conntrack_expect.c

netfilter: nf_conntrack: add direction support for zones

2015-08-18 01:22:50 +02:00

nf_conntrack_extend.c

…

nf_conntrack_ftp.c

…

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

…

nf_conntrack_irc.c

…

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: ctnetlink: add const qualifier to nfnl_hook.get_ct

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

nf_conntrack_pptp.c

netfilter: nf_conntrack: push zone object into functions

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

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_proto.c

…

nf_conntrack_sane.c

…

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

…

nf_conntrack_snmp.c

…

nf_conntrack_standalone.c

netfilter: nf_conntrack: add direction support for zones

2015-08-18 01:22:50 +02:00

nf_conntrack_tftp.c

…

nf_conntrack_timeout.c

…

nf_conntrack_timestamp.c

…

nf_internals.h

netfilter: nf_queue: fix nf_queue_nf_hook_drop()

2015-07-23 16:17:58 +02:00

nf_log_common.c

…

nf_log.c

netfilter: nf_log: wait for rcu grace after logger unregistration

2015-09-17 13:37:31 +02:00

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

…

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: remove hook owner refcounting

2015-10-16 18:21:39 +02:00

nf_tables_core.c

netfilter: Pass priv instead of nf_hook_ops to netfilter hooks

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

nf_tables_inet.c

…

nf_tables_netdev.c

netfilter: Pass priv instead of nf_hook_ops to netfilter hooks

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

nfnetlink_acct.c

netfilter: nfacct: per network namespace support

2015-08-07 11:50:56 +02:00

nfnetlink_cthelper.c

…

nfnetlink_cttimeout.c

nfnetlink_cttimeout: add rcu_barrier() on module removal

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

nfnetlink_log.c

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

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

nfnetlink_queue.c

netfilter: make nf_queue_entry_get_refs return void

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

nfnetlink.c

net/nfnetlink: lockdep_nfnl_is_held can be boolean

2015-10-09 07:49:00 -07:00

nft_bitwise.c

…

nft_byteorder.c

…

nft_cmp.c

…

nft_compat.c

netfilter: nft_compat: skip family comparison in case of NFPROTO_UNSPEC

2015-09-14 18:10:57 +02:00

nft_counter.c

netfilter: nft_counter: convert it to use per-cpu counters

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

nft_ct.c

…

nft_dynset.c

…

nft_exthdr.c

…

nft_hash.c

…

nft_immediate.c

…

nft_limit.c

netfilter: nft_limit: add per-byte limiting

2015-08-07 11:50:50 +02: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: nf_tables: kill nft_pktinfo.ops

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

nft_nat.c

…

nft_payload.c

netfilter: nft_payload: work around vlan header stripping

2015-08-19 08:39:53 +02: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_inet.c

ipv4: Push struct net down into nf_send_reset

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

nft_reject.c

…

x_tables.c

netfilter: remove hook owner refcounting

2015-10-16 18:21:39 +02:00

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_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

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_CONNSECMARK.c

…

xt_conntrack.c

…

xt_cpu.c

…

xt_CT.c

netfilter: conntrack: fix crash on timeout object removal

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

xt_dccp.c

…

xt_devgroup.c

…

xt_dscp.c

…

xt_DSCP.c

…

xt_ecn.c

…

xt_esp.c

…

xt_hashlimit.c

…

xt_helper.c

…

xt_hl.c

…

xt_HL.c

…

xt_HMARK.c

…

xt_IDLETIMER.c

netfilter: IDLETIMER: fix lockdep warning

2015-07-13 17:23:25 +02:00

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_LED.c

…

xt_length.c

…

xt_limit.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_mac.c

…

xt_mark.c

…

xt_multiport.c

…

xt_nat.c

…

xt_NETMAP.c

…

xt_nfacct.c

netfilter: nfacct: per network namespace support

2015-08-07 11:50:56 +02:00

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_osf.c

netfilter: x_tables: Use par->net instead of computing from the passed net devices

2015-09-18 21:58:25 +02: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: x_tables: Use par->net instead of computing from the passed net devices

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

xt_REDIRECT.c

…

xt_repldata.h

…

xt_sctp.c

…

xt_SECMARK.c

…

xt_set.c

netfilter: ipset: Fix coding styles reported by checkpatch.pl

2015-06-14 10:40:18 +02:00

xt_socket.c

netfilter: x_tables: Use par->net instead of computing from the passed net devices

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

xt_state.c

…

xt_statistic.c

…

xt_string.c

…

xt_tcpmss.c

…

xt_TCPMSS.c

netfilter: x_tables: Use par->net instead of computing from the passed net devices

2015-09-18 21:58:25 +02: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_tcpudp.c

…

xt_TEE.c

netfilter: Pass net to nf_dup_ipv4 and nf_dup_ipv6

2015-09-18 21:59:11 +02:00

xt_time.c

…

xt_TPROXY.c

netfilter: x_tables: Use par->net instead of computing from the passed net devices

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

xt_TRACE.c

…

xt_u32.c

…