iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1f6d80358d
linux/net/openvswitch
History
David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-09-23 12:09:27 -04:00
..
actions.c openvswitch: Add recirc and hash action. 2014-09-15 23:28:14 -07:00
datapath.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-09-23 12:09:27 -04:00
datapath.h openvswitch: Add recirc and hash action. 2014-09-15 23:28:14 -07:00
dp_notify.c genetlink: make multicast groups const, prevent abuse 2013-11-19 16:39:06 -05:00
flow_netlink.c openvswitch: Add recirc and hash action. 2014-09-15 23:28:14 -07:00
flow_netlink.h openvswitch: refactor ovs flow extract API. 2014-09-15 23:28:13 -07:00
flow_table.c openvswitch: Use exact lookup for flow_get and flow_del. 2014-06-30 20:47:15 -07:00
flow_table.h openvswitch: Use exact lookup for flow_get and flow_del. 2014-06-30 20:47:15 -07:00
flow.c openvswitch: Add recirc and hash action. 2014-09-15 23:28:14 -07:00
flow.h openvswitch: Add recirc and hash action. 2014-09-15 23:28:14 -07:00
Kconfig openvswitch: Add SCTP support 2013-08-26 14:03:13 -07:00
Makefile openvswitch: Restructure datapath.c and flow.c 2013-10-03 18:16:47 -07:00
vport-gre.c openvswitch: Use tun_key only for egress tunnel path. 2014-09-15 23:28:13 -07:00
vport-internal_dev.c openvswitch: Enable tunnel GSO for OVS bridge. 2014-07-24 01:15:04 -07:00
vport-internal_dev.h openvswitch: introduce rtnl ops stub 2014-07-01 14:40:17 -07:00
vport-netdev.c openvswitch: fix vport-netdev unregister 2013-10-16 14:50:22 -07:00
vport-netdev.h openvswitch: fix vport-netdev unregister 2013-10-16 14:50:22 -07:00
vport-vxlan.c openvswitch: Use tun_key only for egress tunnel path. 2014-09-15 23:28:13 -07:00
vport.c openvswitch: Use tun_key only for egress tunnel path. 2014-09-15 23:28:13 -07:00
vport.h openvswitch: change the data type of error status to atomic_long_t 2014-09-09 11:48:07 -07:00