On Sat, Apr 09, 2016 at 12:12:28PM -0700, Linus Torvalds wrote: > > 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. It doesn't work for git rebase at least. I had to fix up a lot of my WIP perf feature branches manually :-/ -Andi -- 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