[GIT PULL] ARM perf updates for 3.3
Russell King - ARM Linux
linux at arm.linux.org.uk
Sat Dec 3 17:46:54 EST 2011
On Sat, Dec 03, 2011 at 10:21:54AM +0000, Will Deacon wrote:
> On Sat, Dec 03, 2011 at 09:26:59AM +0000, Russell King - ARM Linux wrote:
> > While merging this, I get conflicts in gic.c and omap's common.h. I'm
> > intending to resolve them as below - please check this _before_ I commit
> > it (which means my tree is frozen until this is resolved.)
> This doesn't sound quite right since I don't touch either of these files in
> my perf changes. I suspect that you're getting changes from your recently
> merged fixes branch back from my tree, which is based on -rc4.
Yes, that'll be why. I sent my previous message to Tony so he can
confirm the resolution himself.
The unfortunate thing about that is I can't complete the merge at the
moment, so I can't do anything with my git tree until Tony replies.
(I could abort the merge, but then I'd have to recreate the resolutions
which could be error prone.)
> As it happens, I worked on this with Marc and that resolution looks ok to
> me, although I don't have a board at hand to test it.
Well, I guess Tony won't reply until Monday afternoon, so there's no
immediate rush this weekend.
More information about the linux-arm-kernel