leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
54c9ee3992
linux/net/openvswitch
History
David S. Miller c5e40ee287 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/bridge/br_mdb.c

br_mdb.c conflict was a function call being removed to fix a bug in
'net' but whose signature was changed in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-07-23 00:41:16 -07:00
..
actions.c openvswitch: Make tunnel set action attach a metadata dst 2015-07-21 10:39:06 -07:00
datapath.c openvswitch: Abstract vport name through ovs_vport_name() 2015-07-21 10:39:07 -07:00
datapath.h ip_tunnel: Make ovs_tunnel_info and ovs_key_ipv4_tunnel generic 2015-07-21 10:39:05 -07:00
dp_notify.c openvswitch: Move dev pointer into vport itself 2015-07-21 10:39:07 -07:00
flow_netlink.c openvswitch: Use regular VXLAN net_device device 2015-07-21 10:39:07 -07:00
flow_netlink.h openvswitch: Make tunnel set action attach a metadata dst 2015-07-21 10:39:06 -07:00
flow_table.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-07-23 00:41:16 -07:00
flow_table.h openvswitch: Add support for unique flow IDs. 2015-01-26 15:45:50 -08:00
flow.c ip_tunnel: Make ovs_tunnel_info and ovs_key_ipv4_tunnel generic 2015-07-21 10:39:05 -07:00
flow.h openvswitch: Make tunnel set action attach a metadata dst 2015-07-21 10:39:06 -07:00
Kconfig openvswitch: Use regular VXLAN net_device device 2015-07-21 10:39:07 -07:00
Makefile openvswitch: Use regular VXLAN net_device device 2015-07-21 10:39:07 -07:00
vport-geneve.c ip_tunnel: Make ovs_tunnel_info and ovs_key_ipv4_tunnel generic 2015-07-21 10:39:05 -07:00
vport-gre.c ip_tunnel: Make ovs_tunnel_info and ovs_key_ipv4_tunnel generic 2015-07-21 10:39:05 -07:00
vport-internal_dev.c openvswitch: Abstract vport name through ovs_vport_name() 2015-07-21 10:39:07 -07:00
vport-internal_dev.h openvswitch: introduce rtnl ops stub 2014-07-01 14:40:17 -07:00
vport-netdev.c openvswitch: Use regular VXLAN net_device device 2015-07-21 10:39:07 -07:00
vport-netdev.h openvswitch: Abstract vport name through ovs_vport_name() 2015-07-21 10:39:07 -07:00
vport.c openvswitch: Abstract vport name through ovs_vport_name() 2015-07-21 10:39:07 -07:00
vport.h openvswitch: Abstract vport name through ovs_vport_name() 2015-07-21 10:39:07 -07:00