All of lore.kernel.org
 help / color / mirror / Atom feed
From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] CPU mapping platform updates for 3.2
Date: Fri, 2 Sep 2011 09:38:17 +0100	[thread overview]
Message-ID: <20110902083817.GA11728@e102144-lin.cambridge.arm.com> (raw)
In-Reply-To: <alpine.LFD.2.00.1109012331010.20358@xanadu.home>

Hi Nicolas,

On Fri, Sep 02, 2011 at 04:34:25AM +0100, Nicolas Pitre wrote:
> On Thu, 1 Sep 2011, Will Deacon wrote:
> 
> > Hi Arnd,
> > 
> > Please pull the following CPU mapping patches for 3.2. Russell has merged
> > the core changes into his for-next branch, so this pull is based against
> > that (following the merging discussion we had previously). I can rebase
> > onto next/master if you prefer.
> > 
> > Cheers,
> > 
> > Will
> > 
> > 
> > The following changes since commit 3ad29450aa243a318fae5d50bdc918760436bb02:
> > 
> >   Merge branch 'devel-stable' into for-next (2011-08-28 10:41:19 +0100)
> 
> No, please don't use that as a base.  This commit is likely to vanish 
> the next time RMK reconstructs his for-next branch.  You should instead 
> base those patches on the actual branch tip that RMK merged from you.

D'oh, I thought this might happen. The problem I have is that my core
patches depend on one from Vincent Guittot ("ARM: 7011/1: Add ARM cpu
topology definition"), so I ended up sending my changes via Russell's patch
system.

How about I cherry pick Vincent's patch and my core changes out of next and
use that as a base (on top of -rc4)?

Will

  reply	other threads:[~2011-09-02  8:38 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-01 21:11 [GIT PULL] CPU mapping platform updates for 3.2 Will Deacon
2011-09-02  3:34 ` Nicolas Pitre
2011-09-02  8:38   ` Will Deacon [this message]
2011-09-02 13:13     ` Nicolas Pitre
2011-09-02 13:26       ` Will Deacon
2011-09-10 21:26         ` Arnd Bergmann

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=20110902083817.GA11728@e102144-lin.cambridge.arm.com \
    --to=will.deacon@arm.com \
    --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.