22 Nov
2010
22 Nov
'10
5:48 p.m.
On Mon, 22 Nov 2010, Will Deacon wrote:
Commit 1b6740a1 was marked as stable but conflicts with 93068241.
This patch resolves the conflict so that an OProfile-enabled ARM kernel can be used.
Cc: Catalin Marinas catalin.marinas@arm.com Cc: Linaro Dev linaro-dev@lists.linaro.org Signed-off-by: Will Deacon will.deacon@arm.com
Nicolas - this patch fixes an unresolved merge conflict present in the Linaro 2.6.35-stable tree which results in build failure if oprofile is enabled. The resolution isn't especially trivial but I think I've got it right.
Applied, thanks.
Nicolas