linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Linux support for ARM LPAE
Date: Tue, 6 Dec 2011 12:41:09 +0000	[thread overview]
Message-ID: <20111206124109.GT14542@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <20111202182054.GA3250@arm.com>

On Fri, Dec 02, 2011 at 06:20:54PM +0000, Catalin Marinas wrote:
> Hi Russell,
> 
> 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).

Err, your tree contains a serious error.

tree bb5f2f68dd26a97343d255bb0b66f327cece91a5
parent b4521e369180054ddaacecbe83eadac8878f3501
author Russell King <rmk+kernel@arm.linux.org.uk> 1321983028 +0000
committer Catalin Marinas <catalin.marinas@arm.com> 1322842272 +0000

ARM: pgtable: switch to use pgtable-nopud.h

Nick Piggin noted upon introducing 4level-fixup.h:

| Add a temporary "fallback" header so architectures can run with
| the 4level pagetables patch without modification. All architectures
| should be converted to use the folding headers (include/asm-generic/
| pgtable-nop?d.h) as soon as possible, and the fallback header removed.

This makes ARM compliant with this statement.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

If you commit a patch into a git tree, _you_ are supposed to _always_
add your own sign-off line to it unless it's already there.

Because of this, I'm going to _have_ to throw out the merge of this from
the devel-stable branch (sorry folks) because it's not compliant with the
DCO standards required.

  reply	other threads:[~2011-12-06 12:41 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-02 18:20 [GIT PULL] Linux support for ARM LPAE Catalin Marinas
2011-12-06 12:41 ` Russell King - ARM Linux [this message]
2011-12-06 14:07   ` Catalin Marinas
2011-12-06 23:30     ` Russell King - ARM Linux
2011-12-07 11:23       ` Catalin Marinas
2011-12-07 12:25         ` Catalin Marinas
2011-12-07 20:29           ` Russell King - ARM Linux
2011-12-07 22:15             ` Catalin Marinas
2011-12-07 22:22               ` Russell King - ARM Linux
2011-12-08  0:16             ` Russell King - ARM Linux
2011-12-07 20:10         ` 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=20111206124109.GT14542@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).