Messages in this thread | | | From | Felipe Balbi <> | Subject | Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4 | Date | Tue, 10 Nov 2015 16:58:09 -0600 |
| |
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).
-- balbi [unhandled content-type:application/pgp-signature]
| |