Jeff King <peff@xxxxxxxx> writes: > Not surprising for such a large refactoring, but this has conflicts with > what's in next. Here's the patch to apply on top of the conflicted tree > you get from merging this with "next": Yeah, verifying the manual fixup is a bit tricky indeed. The output from $ git blame -C HEAD^.. -- config.mak.uname | grep '^[^^]' shows only the first line of the resulting file, and the output from $ git blame --reverse -C HEAD^.. -- Makefile | grep '^^' shows only the three-line "Platform specific tweaks" comment, which was replaced by your version in config.mak.uname, so nothing extra was added and nothing important was lost between the two, it seems. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html