On Sat, Apr 9, 2016 at 11:13 AM, Andi Kleen <ak@xxxxxxxxxxxxxxx> wrote: > > Unfortunately perf decided to rename all x86 files, completely > disregarding the needs for backports. So I agree that renaming tends to make backports nastier. That said, there *might* be a more convenient way: > For perf backports you have to run So a plain "git cherry-pick" will get it right too, simply because it does a three-way merge rather than just applying a patch - so you get all the usual git rename detection etc. The advantage is that then you don't need to know about the exact renames you have to do on the patch. Of course, I think Greg uses just quilt to apply those patches, so your "apply the rename to the patch" may be easier in this case. Linus -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html