sdardis added a comment. What revision are you trying it against? It's applying mostly clean for me against https://reviews.llvm.org/rL281613. Only the changes to MipsAsmParser.cpp had a offset change (-2). Repository: rL LLVM https://reviews.llvm.org/D24607