On Tue, Nov 10, 2015 at 2:52 PM, Linus Torvalds <[email protected]> wrote: > On Mon, Nov 9, 2015 at 7:33 PM, Olof Johansson <[email protected]> wrote: >> >> Conflicts: >> >> OMAP timer code has a treewide fix vs code deletion conflict. Delete >> the code in HEAD, go with contents from branch. > > That doesn't look right. It also needs the clocksource_of_init -> > clocksource_probe changes. The code was moved around rather than > deleted.
Argh, yes, of course. I usually build a local copy of the merged contents on top of your latest tree before sending the pull requests, but didn't this time. Thanks for catching this. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
