All of lore.kernel.org
 help / color / mirror / Atom feed
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] DEBUG_LL platform updates for 3.2
Date: Fri, 7 Oct 2011 22:51:39 +0200	[thread overview]
Message-ID: <201110072251.40028.arnd@arndb.de> (raw)
In-Reply-To: <20110928103815.GA8344@e102144-lin.cambridge.arm.com>

On Wednesday 28 September 2011, Will Deacon wrote:
> 
> Hi Arnd,
> 
> Please pull these DEBUG_LL platform updates for 3.2. You can find the core
> updates (actually all resident in arch/arm/Kconfig.debug) in Russell's
> for-next branch.
> 
> I think Stephen Boyd was planning to move MSM to the new code as well, but
> I've not seen any code yet so I guess that can go in later.

Hi Will,

I've tried to pull this branch, but I'm getting conflicts with patches
from the 'CPU mapping platform updates' series you sent me earlier.
Any idea what's going on there?

I can certainly fix up the conflicts, but my feeling is that there is
something wrong on your side and one of the two branches contains
stuff from a stale version of Russell's tree.

	Arnd

  parent reply	other threads:[~2011-10-07 20:51 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-28 10:38 [GIT PULL] DEBUG_LL platform updates for 3.2 Will Deacon
2011-10-03  8:35 ` Will Deacon
2011-10-07 20:51 ` Arnd Bergmann [this message]
2011-10-10 10:36   ` Will Deacon
2011-10-10 11:20     ` Arnd Bergmann
2011-10-10 13:32       ` Will Deacon
2011-10-11  7:52         ` Shawn Guo
2011-10-11 13:33         ` Arnd Bergmann
2011-10-11 15:09           ` Will Deacon
2011-10-11 18:48             ` Will Deacon
2011-10-11 19:25               ` Arnd Bergmann
2011-10-12  0:03                 ` Nicolas Pitre
2011-10-12  8:30                   ` Arnd Bergmann
2011-10-13  8:28                     ` Russell King - ARM Linux
2011-10-13 13:39                       ` Nicolas Pitre
2011-10-13 14:05                         ` Russell King - ARM Linux
2011-10-13 18:36                           ` Nicolas Pitre
2011-10-13 14:50                         ` Arnd Bergmann
2011-10-13 23:09                         ` Ryan Mallon
2011-10-13 23:40                           ` Ryan Mallon
2011-10-14  2:32                           ` Nicolas Pitre
2011-10-12  8:38                   ` Jamie Iles
2011-10-12 20:16                     ` Nicolas Pitre
2011-10-13  8:23                   ` Russell King - ARM Linux
2011-10-13 18:46                     ` Nicolas Pitre
2011-10-12 17:29                 ` Russell King - ARM Linux
2011-10-12 17:35                   ` Will Deacon
2011-10-12 18:01                     ` Russell King - ARM Linux
2011-10-12 18:05                       ` Will Deacon
2011-10-17  8:25                 ` Russell King - ARM Linux
2011-10-17  9:23                   ` Will Deacon
2011-10-20 14:57                     ` Arnd Bergmann
2011-10-21 10:59                       ` Will Deacon
2011-10-21 14:48                         ` Rob Herring
2011-10-21 15:11                           ` Arnd Bergmann
2011-10-21 15:15                           ` Will Deacon
2011-10-21 18:03                             ` Rob Herring
2011-10-21 23:04                               ` Rob Herring

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=201110072251.40028.arnd@arndb.de \
    --to=arnd@arndb.de \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.