lkml.org 
[lkml]   [2015]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the arm-perf tree with the tree
On Mon, Jun 01, 2015 at 01:12:53AM +0100, Stephen Rothwell wrote:
> Hi Will,

Hi Stephen,

> Today's linux-next merge of the arm-perf tree got a conflict in arch/arm/kernel/perf_event_cpu.c between commit 338d9dd3e2ae ("ARM:
> 8351/1: perf: don't warn about missing interrupt-affinity property for
> PPIs") (and others) from Linus' tree and commit 74cf0bc75f16 ("arm:
> perf: unify perf_event{,_cpu}.c") from the arm-perf tree.
>
> I fixed it up (the changes from Linus' tree have been included in the
> arm-perf tree change, so I just removed the file) and can carry the fix
> as necessary (no action is required).

That's the correct resolution, thanks again.

Will


\
 
 \ /
  Last update: 2015-06-01 12:21    [W:0.023 / U:0.428 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site