Message ID | 1447126404-10567-3-git-send-email-olof@lixom.net |
---|---|
State | New |
Headers | show |
On Mon, Nov 9, 2015 at 7:33 PM, Olof Johansson <olof@lixom.net> 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. Linus
Hi, Linus Torvalds <torvalds@linux-foundation.org> writes: > On Mon, Nov 9, 2015 at 7:33 PM, Olof Johansson <olof@lixom.net> 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. correct. Moved from arch/arm/mach-omap2/ to drivers/clocksource/. We're trying to get all our timer code to drivers/clocksource and make it DT-only (when all other platforms switch away from legacy boot).
On Tue, Nov 10, 2015 at 2:52 PM, Linus Torvalds <torvalds@linux-foundation.org> wrote: > On Mon, Nov 9, 2015 at 7:33 PM, Olof Johansson <olof@lixom.net> 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