From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] ARM perf updates for 3.3
Date: Sat, 3 Dec 2011 22:46:54 +0000 [thread overview]
Message-ID: <20111203224654.GN9581@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <20111203102154.GB3860@mudshark.cambridge.arm.com>
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.
next prev parent reply other threads:[~2011-12-03 22:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-02 17:02 [GIT PULL] ARM perf updates for 3.3 Will Deacon
2011-12-03 9:26 ` Russell King - ARM Linux
2011-12-03 10:21 ` Will Deacon
2011-12-03 22:46 ` Russell King - ARM Linux [this message]
2011-12-05 11:23 ` Will Deacon
2011-12-05 21:11 ` Russell King - ARM Linux
2011-12-05 23:19 ` Tony Lindgren
2011-12-06 0:02 ` Tony Lindgren
2011-12-06 16:52 ` Tony Lindgren
2011-12-07 14:17 ` Cousson, Benoit
2011-12-07 15:24 ` Marc Zyngier
2011-12-07 19:44 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111203224654.GN9581@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).