diff options
| author |   Jesse Gross <jesse@nicira.com> | 2013-05-13 08:41:06 -0700 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2013-08-14 15:48:02 -0700 |
| commit | 30444e981ba28e892c439017fbc011d867f02a7d (patch) | |
| tree | 3f26f5da57a38f9365b03696c7cb733f86b67554 /net/openvswitch/flow.c | |
| parent | Linux 3.11-rc1 (diff) | |
| download | linux-dev-30444e981ba28e892c439017fbc011d867f02a7d.tar.xz linux-dev-30444e981ba28e892c439017fbc011d867f02a7d.zip | |
openvswitch: Fix bad merge resolution.
git silently included an extra hunk in vport_cmd_set() during
automatic merging. This code is unreachable so it does not actually
introduce a problem but it is clearly incorrect.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'net/openvswitch/flow.c')
0 files changed, 0 insertions, 0 deletions