diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-16 14:59:01 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-16 14:59:01 -0500 |
| commit | c6ab766e812570c506a4dc2215dc0da3229cfd67 (patch) | |
| tree | 0951f32cc28172e0b0ea7ec10f136092ae609779 /net/ipv4/route.c | |
| parent | 52cff74eef5dd7bdab759300e7d1ca36eba18254 (diff) | |
| parent | fecaef85f7188ad1822210e2c7a7625c9a32a8e4 (diff) | |
Merge branch 'net_ovs' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch
Pravin B Shelar says:
====================
Open vSwitch
Following fixes are accumulated in ovs-repo.
Three of them are related to protocol processing, one is
related to memory leak in case of error and one is to
fix race.
Patch "Validate IPv6 flow key and mask values" has conflicts
with net-next, Let me know if you want me to send the patch
for net-next.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
0 files changed, 0 insertions, 0 deletions