forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/net/openvswitch
History
David S. Miller 64c27237a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/marvell/mvneta.c

The mvneta.c conflict is a case of overlapping changes,
a conversion to devm_ioremap_resource() vs. a conversion
to netdev_alloc_pcpu_stats.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-29 18:48:54 -04:00
..
actions.c net: replace macros net_random and net_srandom with direct calls to prandom 2014-01-14 15:15:25 -08:00
datapath.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-03-29 18:48:54 -04:00
datapath.h openvswitch: rename ->sync to ->syncp 2014-02-15 02:06:23 -05:00
dp_notify.c genetlink: make multicast groups const, prevent abuse 2013-11-19 16:39:06 -05:00
flow.c openvswitch: fix a possible deadlock and lockdep warning 2014-03-28 16:41:53 -04:00
flow.h openvswitch: Per cpu flow stats. 2014-01-06 15:52:24 -08:00
flow_netlink.c net: ovs: use kfree_rcu instead of rcu_free_{sw_flow_mask_cb,acts_callback} 2014-01-06 15:52:30 -08:00
flow_netlink.h openvswitch: Per cpu flow stats. 2014-01-06 15:52:24 -08:00
flow_table.c openvswitch: Fix ovs_flow_free() ovs-lock assert. 2014-02-04 22:21:45 -08:00
flow_table.h openvswitch: Fix kernel panic on ovs_flow_free 2014-02-04 22:21:17 -08: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: remove duplicated include from vport-gre.c 2013-09-23 13:36:31 -07:00
vport-internal_dev.c openvswitch: Enable all GSO features on internal port. 2013-11-01 18:17:50 -07:00
vport-internal_dev.h openvswitch: Replace Nicira Networks. 2012-05-03 18:55:23 -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 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch 2013-11-04 16:25:04 -05:00
vport.c net: Replace u64_stats_fetch_begin_bh to u64_stats_fetch_begin_irq 2014-03-14 22:41:36 -04:00
vport.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch 2014-01-06 19:48:38 -05:00