* linux-next: manual merge of the arm-perf tree with the tree
@ 2015-06-01 0:12 Stephen Rothwell
2015-06-01 9:52 ` Will Deacon
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2015-06-01 0:12 UTC (permalink / raw)
To: Will Deacon; +Cc: linux-next, linux-kernel, Mark Rutland
[-- Attachment #1: Type: text/plain, Size: 604 bytes --]
Hi Will,
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the arm-perf tree with the tree
2015-06-01 0:12 linux-next: manual merge of the arm-perf tree with the tree Stephen Rothwell
@ 2015-06-01 9:52 ` Will Deacon
0 siblings, 0 replies; 2+ messages in thread
From: Will Deacon @ 2015-06-01 9:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Mark Rutland
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-06-01 9:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-01 0:12 linux-next: manual merge of the arm-perf tree with the tree Stephen Rothwell
2015-06-01 9:52 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).