Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1266840

Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 0/6] ARM: SoC branches for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
  [GIT PULL 2/6] ARM: SoC cleanups for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
    Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4 Linus Torvalds <torvalds@linux-foundation.org> - 2015-11-11 00:00 +0100
      Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4 Felipe Balbi <balbi@ti.com> - 2015-11-11 00:00 +0100
      Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-11 00:30 +0100
  [GIT PULL 4/6] ARM: SoC driver updates for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
  [GIT PULL 3/6] ARM: SoC platform updates for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
  [GIT PULL 1/6] ARM: SoC non-urgent fixes for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100
  [GIT PULL 6/6] ARM: SoC defconfig updates for v4.4 Olof Johansson <olof@lixom.net> - 2015-11-10 04:40 +0100

csiph-web