On Mon, Aug 31, 2015 at 5:07 PM, Olof Johansson <o...@lixom.net> wrote:
> We've been able to keep conflicts down this cycle, only a few and none > are hairy. I've described them in the affected pull requests. Grmbl, I just fetched your tree and looked for new conflicts, and it looks like a few more have crept in and diffstats are likely off from the ones in my pull requests. Sorry about that. New conflicts: drivers/clk/ti/Makefike: Looks like an add/remove conflict on nearby lines due to our addition of clk-814x. drivers/pci/host/Kconfig: Bjorn and I picked up different versions of the same fix for a problem that surfaced through the new arm64 dependencies. Go with Bjorn's. drivers/pci/host/pci-iproc.c: Looks like whitespace delta on nearby changes. -Olof -- 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/
