lkml.org 
[lkml]   [2015]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [GIT PULL 2/6] ARM: SoC cleanups for v4.4
From
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


\
 
 \ /
  Last update: 2015-11-11 00:21    [W:0.064 / U:0.344 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site