From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL v2] Linux support for ARM LPAE
Date: Tue, 6 Dec 2011 20:34:16 +0000 [thread overview]
Message-ID: <20111206203416.GV14542@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <20111206152955.GC31720@arm.com>
On Tue, Dec 06, 2011 at 03:29:55PM +0000, Catalin Marinas wrote:
> I updated the series with an additional signed-off-by to your patch. The
> code is unchanged. Could you please pull it again?
I will for this time only, but note - last time you said:
> If there are no further comments, could you please pull the ARM LPAE
> branch below? They should be merged after Will's idmap patches (no real
> conflict, just correctly functioning setup_mm_for_reboot).
Now, the thing is, merging it after Will's patches won't solve that in
any shape or form - it really does not matter what order I do the merges
in, the fact of the matter is that there is no ordering or dependence
between your patches and Will's, so there's no guarantee that your code
will see a properly functioning setup_mm_for_reboot.
If you actually depend on something in some other tree, you need to have
it merged into your tree _before_ the objects which depend on it.
So, what the above comment admits to me is that "what I'm asking you to
pull is known to be broken if a git-bisect hits one of these commits,
but I don't care."
As I said, I will merge it this time around, but next time I won't.
next prev parent reply other threads:[~2011-12-06 20:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-06 15:29 [GIT PULL v2] Linux support for ARM LPAE Catalin Marinas
2011-12-06 20:34 ` Russell King - ARM Linux [this message]
2011-12-06 20:45 ` Russell King - ARM Linux
2011-12-06 22:27 ` Catalin Marinas
2011-12-06 22:24 ` Catalin Marinas
2011-12-06 23:16 ` Russell King - ARM Linux
2011-12-07 10:59 ` Catalin Marinas
2011-12-07 20:01 ` Russell King - ARM Linux
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=20111206203416.GV14542@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).