* [GIT PULL] CPU mapping platform updates for 3.2
@ 2011-09-01 21:11 Will Deacon
2011-09-02 3:34 ` Nicolas Pitre
0 siblings, 1 reply; 6+ messages in thread
From: Will Deacon @ 2011-09-01 21:11 UTC (permalink / raw)
To: linux-arm-kernel
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)
are available in the git repository at:
git://linux-arm.org/linux-2.6-wd.git for-arnd
Will Deacon (5):
ARM: exynos4: convert logical CPU numbers to physical numbers
ARM: msm: convert logical CPU numbers to physical numbers
ARM: shmobile: convert logical CPU numbers to physical numbers
ARM: ux500: convert logical CPU numbers to physical numbers
ARM: versatile: convert logical CPU numbers to physical numbers
arch/arm/mach-exynos4/hotplug.c | 2 +-
arch/arm/mach-exynos4/platsmp.c | 2 +-
arch/arm/mach-msm/hotplug.c | 2 +-
arch/arm/mach-msm/platsmp.c | 2 +-
arch/arm/mach-realview/hotplug.c | 2 +-
arch/arm/mach-shmobile/smp-sh73a0.c | 6 +++++-
arch/arm/mach-ux500/hotplug.c | 2 +-
arch/arm/mach-ux500/platsmp.c | 2 +-
arch/arm/mach-vexpress/hotplug.c | 2 +-
arch/arm/plat-versatile/platsmp.c | 2 +-
10 files changed, 14 insertions(+), 10 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] CPU mapping platform updates for 3.2
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
0 siblings, 1 reply; 6+ messages in thread
From: Nicolas Pitre @ 2011-09-02 3:34 UTC (permalink / raw)
To: linux-arm-kernel
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.
Nicolas
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] CPU mapping platform updates for 3.2
2011-09-02 3:34 ` Nicolas Pitre
@ 2011-09-02 8:38 ` Will Deacon
2011-09-02 13:13 ` Nicolas Pitre
0 siblings, 1 reply; 6+ messages in thread
From: Will Deacon @ 2011-09-02 8:38 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] CPU mapping platform updates for 3.2
2011-09-02 8:38 ` Will Deacon
@ 2011-09-02 13:13 ` Nicolas Pitre
2011-09-02 13:26 ` Will Deacon
0 siblings, 1 reply; 6+ messages in thread
From: Nicolas Pitre @ 2011-09-02 13:13 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, 2 Sep 2011, Will Deacon wrote:
> 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)?
I would instead suggest that you simply use commit c2b9ab71c6 as your
base. It is more likely to remain stable, unlike the top commit in the
for-next branch.
Cherry-picking needed commits would work, but they would end up being
duplicated in two different branches in the final Git history. Git can
cope with that of course, but this is usually something we try to avoid
as this could create some confusion for people.
Nicolas
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] CPU mapping platform updates for 3.2
2011-09-02 13:13 ` Nicolas Pitre
@ 2011-09-02 13:26 ` Will Deacon
2011-09-10 21:26 ` Arnd Bergmann
0 siblings, 1 reply; 6+ messages in thread
From: Will Deacon @ 2011-09-02 13:26 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Sep 02, 2011 at 02:13:09PM +0100, Nicolas Pitre wrote:
> On Fri, 2 Sep 2011, Will Deacon wrote:
> > 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)?
>
> I would instead suggest that you simply use commit c2b9ab71c6 as your
> base. It is more likely to remain stable, unlike the top commit in the
> for-next branch.
Ok, that's easy enough, thanks for the help.
> Cherry-picking needed commits would work, but they would end up being
> duplicated in two different branches in the final Git history. Git can
> cope with that of course, but this is usually something we try to avoid
> as this could create some confusion for people.
Understood. Here's the new pull request...
Will
The following changes since commit c2b9ab71c6e6cf8c48c5f8fda47cd10879c5c7db:
Will Deacon (1):
ARM: 7061/1: gic: convert logical CPU numbers into physical numbers
are available in the git repository at:
git://linux-arm.org/linux-2.6-wd.git for-arnd
Will Deacon (5):
ARM: exynos4: convert logical CPU numbers to physical numbers
ARM: msm: convert logical CPU numbers to physical numbers
ARM: shmobile: convert logical CPU numbers to physical numbers
ARM: ux500: convert logical CPU numbers to physical numbers
ARM: versatile: convert logical CPU numbers to physical numbers
arch/arm/mach-exynos4/hotplug.c | 2 +-
arch/arm/mach-exynos4/platsmp.c | 2 +-
arch/arm/mach-msm/hotplug.c | 2 +-
arch/arm/mach-msm/platsmp.c | 2 +-
arch/arm/mach-realview/hotplug.c | 2 +-
arch/arm/mach-shmobile/smp-sh73a0.c | 6 +++++-
arch/arm/mach-ux500/hotplug.c | 2 +-
arch/arm/mach-ux500/platsmp.c | 2 +-
arch/arm/mach-vexpress/hotplug.c | 2 +-
arch/arm/plat-versatile/platsmp.c | 2 +-
10 files changed, 14 insertions(+), 10 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [GIT PULL] CPU mapping platform updates for 3.2
2011-09-02 13:26 ` Will Deacon
@ 2011-09-10 21:26 ` Arnd Bergmann
0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2011-09-10 21:26 UTC (permalink / raw)
To: linux-arm-kernel
On Friday 02 September 2011, Will Deacon wrote:
> The following changes since commit c2b9ab71c6e6cf8c48c5f8fda47cd10879c5c7db:
> Will Deacon (1):
> ARM: 7061/1: gic: convert logical CPU numbers into physical numbers
>
> are available in the git repository at:
>
> git://linux-arm.org/linux-2.6-wd.git for-arnd
>
Thanks! I've pulled it into the cross-platform/cpu-mapping branch of the
temporary arm-soc tree on git.linaro.org now.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-09-10 21:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2011-09-02 13:13 ` Nicolas Pitre
2011-09-02 13:26 ` Will Deacon
2011-09-10 21:26 ` Arnd Bergmann
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.