https://github.com/torvalds/linux
Revision 30444e981ba28e892c439017fbc011d867f02a7d authored by Jesse Gross on 13 May 2013, 15:41:06 UTC, committed by Jesse Gross on 14 August 2013, 22:48:02 UTC
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>
1 parent ad81f05
History
Tip revision: 30444e981ba28e892c439017fbc011d867f02a7d authored by Jesse Gross on 13 May 2013, 15:41:06 UTC
openvswitch: Fix bad merge resolution.
Tip revision: 30444e9
File Mode Size
Documentation
arch
block
crypto
drivers
firmware
fs
include
init
ipc
kernel
lib
mm
net
samples
scripts
security
sound
tools
usr
virt
.gitignore -rw-r--r-- 1.1 KB
.mailmap -rw-r--r-- 4.4 KB
COPYING -rw-r--r-- 18.3 KB
CREDITS -rw-r--r-- 93.1 KB
Kbuild -rw-r--r-- 2.5 KB
Kconfig -rw-r--r-- 252 bytes
MAINTAINERS -rw-r--r-- 253.4 KB
Makefile -rw-r--r-- 47.4 KB
README -rw-r--r-- 18.3 KB
REPORTING-BUGS -rw-r--r-- 7.3 KB

README

back to top