]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ad81f05) | patch
openvswitch: Fix bad merge resolution.
authorJesse Gross <jesse@nicira.com>
Mon, 13 May 2013 15:41:06 +0000 (08:41 -0700)
committerJesse Gross <jesse@nicira.com>
Wed, 14 Aug 2013 22:48:02 +0000 (15:48 -0700)
commit30444e981ba28e892c439017fbc011d867f02a7d
tree3f26f5da57a38f9365b03696c7cb733f86b67554tree | snapshot
parentad81f0545ef01ea651886dddac4bef6cec930092commit | diff
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>
net/openvswitch/datapath.c diff | blob | history
Linux kernel for KaRo TX COM modules