| Message ID | 20110901211107.GB5209@e102144-lin.cambridge.arm.com |
|---|---|
| State | New |
| Headers | show |
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
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
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
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(-)