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

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

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

2017-06-15 11:59:32 -04:00

..

actions.c

Openvswitch: Refactor sample and recirc actions implementation

2017-03-22 11:28:35 -07:00

conntrack.c

netfilter: introduce nf_conntrack_helper_put helper function

2017-05-15 12:42:29 +02:00

conntrack.h

openvswitch: Pack struct sw_flow_key.

2017-02-09 22:59:34 -05:00

datapath.c

openvswitch: more accurate checksumming in queue_userspace_packet()

2017-05-19 19:21:29 -04:00

datapath.h

openvswitch: Optimize sample action for the clone use cases

2017-03-22 11:28:35 -07:00

dp_notify.c

openvswitch: fix hangup on vxlan/gre/geneve device deletion

2015-12-03 14:29:25 -05:00

flow_netlink.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

flow_netlink.h

openvswitch: Add original direction conntrack tuple to sw_flow_key.

2017-02-09 22:59:34 -05:00

flow_table.c

openvswitch: use percpu flow stats

2016-09-18 22:14:01 -04:00

flow_table.h

openvswitch: Zero flows on allocation.

2015-09-22 17:33:41 -07:00

flow.c

openvswitch: Fix ovs_flow_key_update()

2017-04-01 12:16:46 -07:00

flow.h

openvswitch: Pack struct sw_flow_key.

2017-02-09 22:59:34 -05:00

Kconfig

openvswitch: call only into reachable nf-nat code

2016-03-28 17:58:59 +02:00

Makefile

openvswitch: Remove conntrack Kconfig option.

2015-09-06 23:48:33 -07:00

vport-geneve.c

openvswitch: do not ignore netdev errors when creating tunnel vports

2016-08-10 23:13:23 -07:00

vport-gre.c

openvswitch: do not ignore netdev errors when creating tunnel vports

2016-08-10 23:13:23 -07:00

vport-internal_dev.c

net: Fix inconsistent teardown and release of private netdev state.

2017-06-07 15:53:24 -04:00

vport-internal_dev.h

openvswitch: introduce rtnl ops stub

2014-07-01 14:40:17 -07:00

vport-netdev.c

openvswitch: allow L3 netdev ports

2016-11-13 00:51:02 -05:00

vport-netdev.h

openvswitch: Use dev_queue_xmit for vport send.

2015-10-22 06:46:16 -07:00

vport-vxlan.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

vport.c

openvswitch: add processing of L3 packets

2016-11-13 00:51:02 -05:00

vport.h

openvswitch: pass mac_proto to ovs_vport_send

2016-11-13 00:51:02 -05:00