On Mon, Jul 23, 2012 at 1:32 PM, Arnd Bergmann <a...@arndb.de> wrote: > > There are about 600 changesets in here, and a bunch of simple > conflicts between the 15 branches, but so far no conflicts with > stuff that you have merged already. For reference, you can check > the "for-linus" branch in the same tree to see how we resolved > the conflicts.
Ok, so I've merged some things a bit differently, but afaik it's all semantically identical *except* for the merge of the file arch/arm/mach-omap2/clockdomains3xxx_data.c in my merge of your "general arm-soc cleanups" pull request. In your "for-linus" branch, "&mpu_3xxx_clkdm" remains in the clockdomains_common[] array. In my merge, it is gone. But I think I did the merge correctly, and you did it wrong. HOWEVER, I don't know the code, maybe there is some subtle reason why you did it like you did. Your "for-linus" branch also had that arch/arm/arm-soc-for-next-contents.txt file that shouldn't have been there, but whatever. Anyway, apart from that "please check" comment, I also have small complaint: your pull requests didn't actually point to the tags, they pointed to the next/xyz commits. So every time I did a pull, I had to change "next/xyz" to "tags/xyz". That's just annoying make-work. I think it's because you just said "xyz" to the git request-pull script, and then git had to pick one of the things and picked next. Please disambiguate by just saying "tags/xyz" explicitly. Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/