The modification to source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp is not appropriate in this patch. It already went in as a separate change (llvm.org svn r216745 here: http://lists.cs.uiuc.edu/pipermail/lldb-commits/Week-of-Mon-20140825/012685.html). http://reviews.llvm.org/D5108