diff options
author | David S. Miller <davem@davemloft.net> | 2014-07-25 08:18:21 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-25 08:18:21 +0200 |
commit | 9239079080fe364189d13020441c46f9f0e0071d (patch) | |
tree | 913a82ae0c7968736e6e2ef6211b744cd4787383 /net/ipv4/igmp.c | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh... (diff) | |
parent | openvswitch: Add skb_clone NULL check for the sampling action. (diff) | |
download | linux-9239079080fe364189d13020441c46f9f0e0071d.tar.xz linux-9239079080fe364189d13020441c46f9f0e0071d.zip |
Merge branch 'net_next_ovs' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch
Pravin B Shelar says:
====================
Open vSwitch
Following patches adds three features to OVS
1. Add fairness to upcall processing.
2. Hash action.
3. Enable Tunnel GSO features.
Rest of patches are bug fixes related to patches from same series.
v2 series changes first patch according to comment from Dave Miller.
v3 series changes first patch according to comment from Nikolay Aleksandrov.
v4 series update recirc patch commit msg.
v5 series resolve conflict with net-next, updated recic action patch.
v6 series sends all patches.
v7 series drop recirc patches.
v8 series checkpatch fix
v9 series drop HASH action patch. update sample action commit msg.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/igmp.c')
0 files changed, 0 insertions, 0 deletions