* ARM/ARM-SoC plans for v3.4 merge window
@ 2012-01-23 11:49 Russell King - ARM Linux
2012-01-24 9:50 ` Russell King - ARM Linux
0 siblings, 1 reply; 11+ messages in thread
From: Russell King - ARM Linux @ 2012-01-23 11:49 UTC (permalink / raw)
To: linux-arm-kernel
This is an outline of the plan for this cycle, up to the next merge
window, agreed between Olof and myself.
As Nicolas' idle changes weren't merged before the last merge window
opened, we have decided that Nicolas will resubmit his changes after
-rc1 (in other words, now) and they will be merged into both the
arm-soc and my trees.
I have at least one other patch which has a high 'will cause horrible
conficts' rating (the debug option rearrangement patch), so I'll be
including that for the arm-soc tree as well.
However, what this does mean is that Arnd, Olof, and myself will be
in for up to three months of merge hell unless people take account of
these changes.
Therefore, our plan is to publish this as a baseline, and we'd really
appreciate any development submitted after that baseline has been
established is based upon those changes and does not conflict with
them. That may mean you have to pull these changes into your tree
and merge them into your development work (and fix up any conflicts
there yourself.)
Once you've taken these changes into your tree, you must not rebase or
modify them. Changing those commits will cause all hell to break loose,
and we'll have to refuse merging your tree (otherwise we'll be in Linus'
sights for a roasting at gas mark 2 million.)
^ permalink raw reply [flat|nested] 11+ messages in thread
* ARM/ARM-SoC plans for v3.4 merge window
2012-01-23 11:49 ARM/ARM-SoC plans for v3.4 merge window Russell King - ARM Linux
@ 2012-01-24 9:50 ` Russell King - ARM Linux
2012-01-24 10:56 ` Will Deacon
2012-01-26 21:23 ` Russell King - ARM Linux
0 siblings, 2 replies; 11+ messages in thread
From: Russell King - ARM Linux @ 2012-01-24 9:50 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jan 23, 2012 at 11:49:02AM +0000, Russell King - ARM Linux wrote:
> This is an outline of the plan for this cycle, up to the next merge
> window, agreed between Olof and myself.
>
> As Nicolas' idle changes weren't merged before the last merge window
> opened, we have decided that Nicolas will resubmit his changes after
> -rc1 (in other words, now) and they will be merged into both the
> arm-soc and my trees.
>
> I have at least one other patch which has a high 'will cause horrible
> conficts' rating (the debug option rearrangement patch), so I'll be
> including that for the arm-soc tree as well.
>
> However, what this does mean is that Arnd, Olof, and myself will be
> in for up to three months of merge hell unless people take account of
> these changes.
>
> Therefore, our plan is to publish this as a baseline, and we'd really
> appreciate any development submitted after that baseline has been
> established is based upon those changes and does not conflict with
> them. That may mean you have to pull these changes into your tree
> and merge them into your development work (and fix up any conflicts
> there yourself.)
>
> Once you've taken these changes into your tree, you must not rebase or
> modify them. Changing those commits will cause all hell to break loose,
> and we'll have to refuse merging your tree (otherwise we'll be in Linus'
> sights for a roasting at gas mark 2 million.)
Right, although it's out there - but I'd like to get the AMBA changes
into it which are already conflicting the Samsung development. So I'm
going to hold off officially asking for people to include the baseline
until this evening. At that point, I will shut down my 'amba' branch
and transfer that over; that means I won't be accepting any further
acks etc for that work.
If you haven't acked changes in the amba branch (eg, to Versatile,
Realview etc) then it'll soon be too late...
^ permalink raw reply [flat|nested] 11+ messages in thread
* ARM/ARM-SoC plans for v3.4 merge window
2012-01-24 9:50 ` Russell King - ARM Linux
@ 2012-01-24 10:56 ` Will Deacon
2012-01-24 11:27 ` Russell King - ARM Linux
2012-01-26 21:23 ` Russell King - ARM Linux
1 sibling, 1 reply; 11+ messages in thread
From: Will Deacon @ 2012-01-24 10:56 UTC (permalink / raw)
To: linux-arm-kernel
Hi Russell,
On Tue, Jan 24, 2012 at 09:50:09AM +0000, Russell King - ARM Linux wrote:
> Right, although it's out there - but I'd like to get the AMBA changes
> into it which are already conflicting the Samsung development. So I'm
> going to hold off officially asking for people to include the baseline
> until this evening. At that point, I will shut down my 'amba' branch
> and transfer that over; that means I won't be accepting any further
> acks etc for that work.
>
> If you haven't acked changes in the amba branch (eg, to Versatile,
> Realview etc) then it'll soon be too late...
I took a look at your amba branch, but all I can see in there is:
6cfa627 ARM: 7079/1: spi: Fix builderror in spi-pl022.c
1c3be36 PM: add runtime PM support to MMCI
92b97f0 PM: add runtime PM support to core Primecell driver
which don't seem to touch Versatile or Realview. Am I looking in the wrong
place?
Cheers,
Will
^ permalink raw reply [flat|nested] 11+ messages in thread
* ARM/ARM-SoC plans for v3.4 merge window
2012-01-24 10:56 ` Will Deacon
@ 2012-01-24 11:27 ` Russell King - ARM Linux
2012-01-24 11:45 ` Will Deacon
0 siblings, 1 reply; 11+ messages in thread
From: Russell King - ARM Linux @ 2012-01-24 11:27 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 24, 2012 at 10:56:45AM +0000, Will Deacon wrote:
> Hi Russell,
>
> On Tue, Jan 24, 2012 at 09:50:09AM +0000, Russell King - ARM Linux wrote:
> > Right, although it's out there - but I'd like to get the AMBA changes
> > into it which are already conflicting the Samsung development. So I'm
> > going to hold off officially asking for people to include the baseline
> > until this evening. At that point, I will shut down my 'amba' branch
> > and transfer that over; that means I won't be accepting any further
> > acks etc for that work.
> >
> > If you haven't acked changes in the amba branch (eg, to Versatile,
> > Realview etc) then it'll soon be too late...
>
> I took a look at your amba branch, but all I can see in there is:
>
> 6cfa627 ARM: 7079/1: spi: Fix builderror in spi-pl022.c
> 1c3be36 PM: add runtime PM support to MMCI
> 92b97f0 PM: add runtime PM support to core Primecell driver
>
> which don't seem to touch Versatile or Realview. Am I looking in the wrong
> place?
Erm, I don't think you're looking at the right branch - especially as
all the commits start "ARM: amba:". They were sent out to the mailing
list on 20th Jan as a set of 31 patches (latest first):
ARM: amba: samsung: use common amba device initializers
ARM: amba: spear: use common amba device initializers
ARM: amba: nomadik: use common amba device initializers
ARM: amba: u300: use common amba device initializers
ARM: amba: lpc32xx: use common amba device initializers
ARM: amba: netx: use common amba device initializers
ARM: amba: bcmring: use common amba device initializers
ARM: amba: ep93xx: use common amba device initializers
ARM: amba: omap2: use common amba device initializers
ARM: amba: integrator: use common amba device initializers
ARM: amba: realview: get rid of private platform amba_device initializer
ARM: amba: versatile: get rid of private platform amba_device initializer
ARM: amba: vexpress: get rid of private platform amba_device initializer
ARM: amba: provide common initializers for static amba devices
ARM: amba: make use of -1 IRQs warn
ARM: amba: u300: get rid of NO_IRQ initializers
ARM: amba: spear: get rid of NO_IRQ initializers
ARM: amba: netx: get rid of NO_IRQ initializers
ARM: amba: nomadik: get rid of NO_IRQ initializers
ARM: amba: mxs: get rid of NO_IRQ initializers
ARM: amba: lpc32xx: get rid of NO_IRQ initializers
ARM: amba: integrator/realview/versatile/vexpress: get rid of NO_IRQ initializers
ARM: amba: samsung: get rid of NO_IRQ initializers
ARM: amba: get rid of NO_IRQ initializers
ARM: amba: ux500: get rid of NO_IRQ
ARM: amba: make irq 0 invalid
ARM: amba: mxs: convert to use amba_device_alloc
ARM: amba: integrator: convert to use amba_device_alloc
ARM: amba: ux500: convert to use amba_device_alloc
ARM: amba: of: convert to use amba_device_alloc
ARM: amba: add amba_device allocation/add/put functions
^ permalink raw reply [flat|nested] 11+ messages in thread
* ARM/ARM-SoC plans for v3.4 merge window
2012-01-24 11:27 ` Russell King - ARM Linux
@ 2012-01-24 11:45 ` Will Deacon
0 siblings, 0 replies; 11+ messages in thread
From: Will Deacon @ 2012-01-24 11:45 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 24, 2012 at 11:27:45AM +0000, Russell King - ARM Linux wrote:
> On Tue, Jan 24, 2012 at 10:56:45AM +0000, Will Deacon wrote:
> > I took a look at your amba branch, but all I can see in there is:
> >
> > 6cfa627 ARM: 7079/1: spi: Fix builderror in spi-pl022.c
> > 1c3be36 PM: add runtime PM support to MMCI
> > 92b97f0 PM: add runtime PM support to core Primecell driver
> >
> > which don't seem to touch Versatile or Realview. Am I looking in the wrong
> > place?
>
> Erm, I don't think you're looking at the right branch - especially as
> all the commits start "ARM: amba:". They were sent out to the mailing
> list on 20th Jan as a set of 31 patches (latest first):
[...]
Indeed, the amba branch I was looking at no longer exists on your server and
a git prune removed it. I'll take a look at the guys in devel-3.3 instead.
Thanks,
Will
^ permalink raw reply [flat|nested] 11+ messages in thread
* ARM/ARM-SoC plans for v3.4 merge window
2012-01-24 9:50 ` Russell King - ARM Linux
2012-01-24 10:56 ` Will Deacon
@ 2012-01-26 21:23 ` Russell King - ARM Linux
2012-01-28 23:57 ` Olof Johansson
1 sibling, 1 reply; 11+ messages in thread
From: Russell King - ARM Linux @ 2012-01-26 21:23 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 24, 2012 at 09:50:09AM +0000, Russell King - ARM Linux wrote:
> On Mon, Jan 23, 2012 at 11:49:02AM +0000, Russell King - ARM Linux wrote:
> > This is an outline of the plan for this cycle, up to the next merge
> > window, agreed between Olof and myself.
> >
> > As Nicolas' idle changes weren't merged before the last merge window
> > opened, we have decided that Nicolas will resubmit his changes after
> > -rc1 (in other words, now) and they will be merged into both the
> > arm-soc and my trees.
> >
> > I have at least one other patch which has a high 'will cause horrible
> > conficts' rating (the debug option rearrangement patch), so I'll be
> > including that for the arm-soc tree as well.
> >
> > However, what this does mean is that Arnd, Olof, and myself will be
> > in for up to three months of merge hell unless people take account of
> > these changes.
> >
> > Therefore, our plan is to publish this as a baseline, and we'd really
> > appreciate any development submitted after that baseline has been
> > established is based upon those changes and does not conflict with
> > them. That may mean you have to pull these changes into your tree
> > and merge them into your development work (and fix up any conflicts
> > there yourself.)
> >
> > Once you've taken these changes into your tree, you must not rebase or
> > modify them. Changing those commits will cause all hell to break loose,
> > and we'll have to refuse merging your tree (otherwise we'll be in Linus'
> > sights for a roasting at gas mark 2 million.)
>
> Right, although it's out there - but I'd like to get the AMBA changes
> into it which are already conflicting the Samsung development. So I'm
> going to hold off officially asking for people to include the baseline
> until this evening. At that point, I will shut down my 'amba' branch
> and transfer that over; that means I won't be accepting any further
> acks etc for that work.
>
> If you haven't acked changes in the amba branch (eg, to Versatile,
> Realview etc) then it'll soon be too late...
And we're now there. So...
Arnd, Olaf,
Please incorporate the latest ARM (for-armsoc branch) changes, which can be found at:
git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git for-armsoc
with SHA1 dcf81c1af839b77b44404453ecae6e5ac5a75f05.
This will update the following files:
arch/arm/Kconfig.debug | 156 ++++++++++----------
arch/arm/include/asm/system.h | 1 +
arch/arm/kernel/process.c | 27 ++--
arch/arm/mach-at91/at91cap9.c | 8 +
arch/arm/mach-at91/at91rm9200.c | 10 ++
arch/arm/mach-at91/at91sam9260.c | 8 +
arch/arm/mach-at91/at91sam9261.c | 8 +
arch/arm/mach-at91/at91sam9263.c | 8 +
arch/arm/mach-at91/at91sam9g45.c | 7 +
arch/arm/mach-at91/at91sam9rl.c | 8 +
arch/arm/mach-at91/at91x40.c | 12 ++
arch/arm/mach-at91/include/mach/system.h | 50 -------
arch/arm/mach-bcmring/core.c | 23 +---
arch/arm/mach-bcmring/include/mach/system.h | 28 ----
arch/arm/mach-clps711x/common.c | 16 ++
arch/arm/mach-clps711x/include/mach/system.h | 35 -----
arch/arm/mach-cns3xxx/include/mach/system.h | 25 ----
arch/arm/mach-davinci/include/mach/system.h | 21 ---
arch/arm/mach-dove/include/mach/system.h | 17 ---
arch/arm/mach-ebsa110/core.c | 25 ++++
arch/arm/mach-ebsa110/include/mach/system.h | 37 -----
arch/arm/mach-ep93xx/core.c | 46 +------
arch/arm/mach-ep93xx/include/mach/system.h | 7 -
arch/arm/mach-exynos/common.c | 12 --
arch/arm/mach-exynos/dma.c | 38 +-----
arch/arm/mach-exynos/include/mach/system.h | 20 ---
arch/arm/mach-footbridge/include/mach/system.h | 13 --
arch/arm/mach-gemini/Makefile | 2 +-
arch/arm/mach-gemini/idle.c | 29 ++++
arch/arm/mach-gemini/include/mach/system.h | 14 --
arch/arm/mach-gemini/irq.c | 4 +-
arch/arm/mach-h720x/common.c | 18 +++
arch/arm/mach-h720x/include/mach/system.h | 27 ----
arch/arm/mach-highbank/include/mach/system.h | 24 ---
arch/arm/mach-imx/mm-imx3.c | 52 ++++----
arch/arm/mach-imx/pm-imx27.c | 3 +-
arch/arm/mach-integrator/core.c | 70 ++--------
arch/arm/mach-integrator/impd1.c | 9 +-
arch/arm/mach-integrator/include/mach/system.h | 33 -----
arch/arm/mach-integrator/integrator_cp.c | 49 ++------
arch/arm/mach-iop13xx/include/mach/system.h | 13 --
arch/arm/mach-iop32x/include/mach/system.h | 13 --
arch/arm/mach-iop33x/include/mach/system.h | 13 --
arch/arm/mach-ixp2000/include/mach/system.h | 14 --
arch/arm/mach-ixp23xx/core.c | 3 +
arch/arm/mach-ixp23xx/include/mach/system.h | 16 --
arch/arm/mach-ixp4xx/common.c | 6 +
arch/arm/mach-ixp4xx/include/mach/system.h | 19 ---
arch/arm/mach-kirkwood/include/mach/system.h | 17 ---
arch/arm/mach-ks8695/include/mach/system.h | 27 ----
arch/arm/mach-lpc32xx/include/mach/system.h | 27 ----
arch/arm/mach-lpc32xx/phy3250.c | 32 +----
arch/arm/mach-mmp/include/mach/system.h | 16 --
arch/arm/mach-msm/idle.S | 36 -----
arch/arm/mach-msm/idle.c | 49 +++++++
arch/arm/mach-msm/include/mach/system.h | 1 -
arch/arm/mach-mv78xx0/include/mach/system.h | 17 ---
arch/arm/mach-mx5/mm.c | 28 ++---
arch/arm/mach-mxs/devices.c | 8 +-
arch/arm/mach-mxs/devices/amba-duart.c | 2 +-
arch/arm/mach-mxs/include/mach/system.h | 25 ----
arch/arm/mach-mxs/pm.c | 3 +-
arch/arm/mach-netx/fb.c | 13 +--
arch/arm/mach-netx/include/mach/system.h | 28 ----
arch/arm/mach-nomadik/board-nhk8815.c | 17 +--
arch/arm/mach-nomadik/cpu-8815.c | 9 +-
arch/arm/mach-nomadik/include/mach/system.h | 32 -----
arch/arm/mach-omap1/include/mach/system.h | 5 -
arch/arm/mach-omap1/pm.c | 19 +--
arch/arm/mach-omap2/emu.c | 26 +---
arch/arm/mach-omap2/include/mach/system.h | 5 -
arch/arm/mach-omap2/pm24xx.c | 4 +-
arch/arm/mach-omap2/pm34xx.c | 6 +-
arch/arm/mach-omap2/pm44xx.c | 8 +-
arch/arm/mach-omap2/prm_common.c | 1 -
arch/arm/mach-orion5x/include/mach/system.h | 19 ---
arch/arm/mach-picoxcell/include/mach/system.h | 26 ----
arch/arm/mach-pnx4008/include/mach/system.h | 29 ----
arch/arm/mach-prima2/include/mach/system.h | 17 ---
arch/arm/mach-pxa/include/mach/system.h | 15 --
arch/arm/mach-realview/core.h | 20 +--
arch/arm/mach-realview/include/mach/irqs-pb1176.h | 2 +-
arch/arm/mach-realview/include/mach/system.h | 33 -----
arch/arm/mach-realview/realview_eb.c | 78 +++++-----
arch/arm/mach-realview/realview_pb1176.c | 78 +++++-----
arch/arm/mach-realview/realview_pb11mp.c | 78 +++++-----
arch/arm/mach-realview/realview_pba8.c | 78 +++++-----
arch/arm/mach-realview/realview_pbx.c | 78 +++++-----
arch/arm/mach-rpc/include/mach/system.h | 13 --
arch/arm/mach-s3c2410/include/mach/system.h | 54 -------
arch/arm/mach-s3c2412/s3c2412.c | 4 +-
arch/arm/mach-s3c2416/s3c2416.c | 3 -
arch/arm/mach-s3c64xx/include/mach/system.h | 19 ---
arch/arm/mach-s5p64x0/common.c | 15 +--
arch/arm/mach-s5p64x0/dma.c | 22 +---
arch/arm/mach-s5p64x0/include/mach/system.h | 21 ---
arch/arm/mach-s5pc100/common.c | 12 --
arch/arm/mach-s5pc100/dma.c | 38 +-----
arch/arm/mach-s5pc100/include/mach/system.h | 19 ---
arch/arm/mach-s5pv210/common.c | 12 --
arch/arm/mach-s5pv210/dma.c | 38 +-----
arch/arm/mach-s5pv210/include/mach/system.h | 21 ---
arch/arm/mach-sa1100/include/mach/system.h | 9 --
arch/arm/mach-shark/core.c | 6 +
arch/arm/mach-shark/include/mach/system.h | 13 --
arch/arm/mach-shmobile/include/mach/system.h | 5 -
arch/arm/mach-spear3xx/include/mach/system.h | 19 ---
arch/arm/mach-spear3xx/spear300.c | 14 +--
arch/arm/mach-spear3xx/spear3xx.c | 27 +---
arch/arm/mach-spear6xx/include/mach/system.h | 19 ---
arch/arm/mach-spear6xx/spear6xx.c | 10 +-
arch/arm/mach-tegra/common.c | 3 +-
arch/arm/mach-tegra/include/mach/system.h | 28 ----
arch/arm/mach-u300/core.c | 85 ++---------
arch/arm/mach-u300/include/mach/system.h | 14 --
arch/arm/mach-ux500/devices-common.c | 13 +--
arch/arm/mach-ux500/include/mach/system.h | 20 ---
arch/arm/mach-versatile/core.c | 70 +++++-----
arch/arm/mach-versatile/core.h | 20 +--
arch/arm/mach-versatile/include/mach/system.h | 33 -----
arch/arm/mach-versatile/versatile_pb.c | 18 ++--
arch/arm/mach-vexpress/core.h | 17 ---
arch/arm/mach-vexpress/ct-ca9x4.c | 8 +-
arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 2 +-
arch/arm/mach-vexpress/include/mach/system.h | 33 -----
arch/arm/mach-vexpress/v2m.c | 20 ++--
arch/arm/mach-vt8500/include/mach/system.h | 5 -
arch/arm/mach-w90x900/dev.c | 1 +
arch/arm/mach-w90x900/include/mach/system.h | 19 ---
arch/arm/mach-zynq/include/mach/system.h | 23 ---
arch/arm/plat-mxc/include/mach/system.h | 25 ----
arch/arm/plat-omap/include/plat/system.h | 15 --
arch/arm/plat-s3c24xx/cpu.c | 27 ++++
arch/arm/plat-spear/include/plat/system.h | 26 ----
drivers/amba/bus.c | 105 +++++++++++----
drivers/mmc/host/mmci.c | 2 +-
drivers/of/platform.c | 6 +-
include/linux/amba/bus.h | 36 +++++
138 files changed, 893 insertions(+), 2303 deletions(-)
delete mode 100644 arch/arm/mach-at91/include/mach/system.h
delete mode 100644 arch/arm/mach-bcmring/include/mach/system.h
delete mode 100644 arch/arm/mach-clps711x/include/mach/system.h
delete mode 100644 arch/arm/mach-cns3xxx/include/mach/system.h
delete mode 100644 arch/arm/mach-davinci/include/mach/system.h
delete mode 100644 arch/arm/mach-dove/include/mach/system.h
delete mode 100644 arch/arm/mach-ebsa110/include/mach/system.h
delete mode 100644 arch/arm/mach-ep93xx/include/mach/system.h
delete mode 100644 arch/arm/mach-exynos/include/mach/system.h
delete mode 100644 arch/arm/mach-footbridge/include/mach/system.h
create mode 100644 arch/arm/mach-gemini/idle.c
delete mode 100644 arch/arm/mach-h720x/include/mach/system.h
delete mode 100644 arch/arm/mach-highbank/include/mach/system.h
delete mode 100644 arch/arm/mach-integrator/include/mach/system.h
delete mode 100644 arch/arm/mach-iop13xx/include/mach/system.h
delete mode 100644 arch/arm/mach-iop32x/include/mach/system.h
delete mode 100644 arch/arm/mach-iop33x/include/mach/system.h
delete mode 100644 arch/arm/mach-ixp2000/include/mach/system.h
delete mode 100644 arch/arm/mach-ixp23xx/include/mach/system.h
delete mode 100644 arch/arm/mach-ixp4xx/include/mach/system.h
delete mode 100644 arch/arm/mach-kirkwood/include/mach/system.h
delete mode 100644 arch/arm/mach-ks8695/include/mach/system.h
delete mode 100644 arch/arm/mach-lpc32xx/include/mach/system.h
delete mode 100644 arch/arm/mach-mmp/include/mach/system.h
delete mode 100644 arch/arm/mach-msm/idle.S
create mode 100644 arch/arm/mach-msm/idle.c
delete mode 100644 arch/arm/mach-mv78xx0/include/mach/system.h
delete mode 100644 arch/arm/mach-mxs/include/mach/system.h
delete mode 100644 arch/arm/mach-netx/include/mach/system.h
delete mode 100644 arch/arm/mach-nomadik/include/mach/system.h
delete mode 100644 arch/arm/mach-omap1/include/mach/system.h
delete mode 100644 arch/arm/mach-omap2/include/mach/system.h
delete mode 100644 arch/arm/mach-orion5x/include/mach/system.h
delete mode 100644 arch/arm/mach-picoxcell/include/mach/system.h
delete mode 100644 arch/arm/mach-pnx4008/include/mach/system.h
delete mode 100644 arch/arm/mach-prima2/include/mach/system.h
delete mode 100644 arch/arm/mach-pxa/include/mach/system.h
delete mode 100644 arch/arm/mach-realview/include/mach/system.h
delete mode 100644 arch/arm/mach-rpc/include/mach/system.h
delete mode 100644 arch/arm/mach-s3c2410/include/mach/system.h
delete mode 100644 arch/arm/mach-s3c64xx/include/mach/system.h
delete mode 100644 arch/arm/mach-s5p64x0/include/mach/system.h
delete mode 100644 arch/arm/mach-s5pc100/include/mach/system.h
delete mode 100644 arch/arm/mach-s5pv210/include/mach/system.h
delete mode 100644 arch/arm/mach-sa1100/include/mach/system.h
delete mode 100644 arch/arm/mach-shark/include/mach/system.h
delete mode 100644 arch/arm/mach-spear3xx/include/mach/system.h
delete mode 100644 arch/arm/mach-spear6xx/include/mach/system.h
delete mode 100644 arch/arm/mach-tegra/include/mach/system.h
delete mode 100644 arch/arm/mach-u300/include/mach/system.h
delete mode 100644 arch/arm/mach-ux500/include/mach/system.h
delete mode 100644 arch/arm/mach-versatile/include/mach/system.h
delete mode 100644 arch/arm/mach-vexpress/include/mach/system.h
delete mode 100644 arch/arm/mach-w90x900/include/mach/system.h
delete mode 100644 arch/arm/mach-zynq/include/mach/system.h
delete mode 100644 arch/arm/plat-mxc/include/mach/system.h
delete mode 100644 arch/arm/plat-omap/include/plat/system.h
delete mode 100644 arch/arm/plat-spear/include/plat/system.h
through these changes:
Nicolas Pitre (23):
ARM: OMAP1: Fix pm_idle during suspend
ARM: clean up idle handlers
ARM: OMAP: convert idle handlers from pm_idle to arm_pm_idle
ARM: mach-s5pv210: use standard arch_idle()
ARM: mach-s5pc100: use standard arch_idle()
ARM: mach-s5p64x0: move idle handler from pm_idle to arm_pm_idle
ARM: mach-exynos: use standard arch_idle()
ARM: mach-at91: move special idle code out of line
ARM: mach-clps711x: move special idle code out of line
ARM: mach-ebsa110: move special idle code out of line
ARM: mach-gemini: move special idle code out of line
ARM: mach-h720x: move special idle code out of line
ARM: s3c24xx: move special idle code to out of line
ARM: plat-mxc: hook special idle handlers to arm_pm_idle
ARM: mach-msm: hook special idle handlers to arm_pm_idle
ARM: mach-ixp23xx: properly disable CPU idle call
ARM: mach-ixp4xx: properly disable CPU idle call
ARM: mach-shark: properly disable CPU idle call
ARM: mach-w90x900: properly disable CPU idle call
ARM: mach-s3c64xx: use standard arch_idle() implementation
ARM: mach-tegra: properly disable CPU idle call
ARM: substitute arch_idle()
ARM: big removal of now unused arch_idle()
Russell King (34):
ARM: debug: arrange Kconfig options more logically
Merge branches 'debug' and 'idle' into for-armsoc
ARM: amba: add amba_device allocation/add/put functions
ARM: amba: of: convert to use amba_device_alloc
ARM: amba: ux500: convert to use amba_device_alloc
ARM: amba: integrator: convert to use amba_device_alloc
ARM: amba: mxs: convert to use amba_device_alloc
ARM: amba: make irq 0 invalid
ARM: amba: ux500: get rid of NO_IRQ
ARM: amba: get rid of NO_IRQ initializers
ARM: amba: samsung: get rid of NO_IRQ initializers
ARM: amba: integrator/realview/versatile/vexpress: get rid of NO_IRQ initializers
ARM: amba: lpc32xx: get rid of NO_IRQ initializers
ARM: amba: mxs: get rid of NO_IRQ initializers
ARM: amba: nomadik: get rid of NO_IRQ initializers
ARM: amba: netx: get rid of NO_IRQ initializers
ARM: amba: spear: get rid of NO_IRQ initializers
ARM: amba: u300: get rid of NO_IRQ initializers
ARM: amba: make use of -1 IRQs warn
ARM: amba: provide common initializers for static amba devices
ARM: amba: vexpress: get rid of private platform amba_device initializer
ARM: amba: versatile: get rid of private platform amba_device initializer
ARM: amba: realview: get rid of private platform amba_device initializer
ARM: amba: integrator: use common amba device initializers
ARM: amba: omap2: use common amba device initializers
ARM: amba: ep93xx: use common amba device initializers
ARM: amba: bcmring: use common amba device initializers
ARM: amba: netx: use common amba device initializers
ARM: amba: lpc32xx: use common amba device initializers
ARM: amba: u300: use common amba device initializers
ARM: amba: nomadik: use common amba device initializers
ARM: amba: spear: use common amba device initializers
ARM: amba: samsung: use common amba device initializers
Merge branch 'amba' into for-armsoc
Will Deacon (1):
ARM: 7300/1: realview: fix definition of GPIO0 interrupt on PB1176 to match TRM
Thanks.
^ permalink raw reply [flat|nested] 11+ messages in thread
* ARM/ARM-SoC plans for v3.4 merge window
2012-01-26 21:23 ` Russell King - ARM Linux
@ 2012-01-28 23:57 ` Olof Johansson
2012-01-30 10:08 ` Nicolas Ferre
0 siblings, 1 reply; 11+ messages in thread
From: Olof Johansson @ 2012-01-28 23:57 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Thu, Jan 26, 2012 at 1:23 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> And we're now there. ?So...
>
> Arnd, Olaf,
>
> Please incorporate the latest ARM (for-armsoc branch) changes, which can be found at:
>
> ? ? ? ?git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git for-armsoc
>
> with SHA1 dcf81c1af839b77b44404453ecae6e5ac5a75f05.
Thanks. I have added this as depends/rmk/for-armsoc in the arm-soc repo.
Any next/ branch we start will have this as the base of said branch,
so any vendor branches must either already be developed against this
stable branch, or merge on top of this with minimal conflicts.
Thanks!
-Olof
^ permalink raw reply [flat|nested] 11+ messages in thread
* ARM/ARM-SoC plans for v3.4 merge window
2012-01-28 23:57 ` Olof Johansson
@ 2012-01-30 10:08 ` Nicolas Ferre
2012-02-08 1:18 ` Olof Johansson
0 siblings, 1 reply; 11+ messages in thread
From: Nicolas Ferre @ 2012-01-30 10:08 UTC (permalink / raw)
To: linux-arm-kernel
On 01/29/2012 12:57 AM, Olof Johansson :
> Hi,
>
>
> On Thu, Jan 26, 2012 at 1:23 PM, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
>
>
>> And we're now there. So...
>>
>> Arnd, Olaf,
>>
>> Please incorporate the latest ARM (for-armsoc branch) changes, which can be found at:
>>
>> git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git for-armsoc
>>
>> with SHA1 dcf81c1af839b77b44404453ecae6e5ac5a75f05.
>
> Thanks. I have added this as depends/rmk/for-armsoc in the arm-soc repo.
>
> Any next/ branch we start will have this as the base of said branch,
> so any vendor branches must either already be developed against this
> stable branch, or merge on top of this with minimal conflicts.
Ok, great.
I just let you know that there is a conflict between the current Linus'
tree (with recently updated at91 fixes) and this rmk/for-armsoc branch.
I can give you the resolution of this conflict easily but I would like
to know which way I execute the merge:
I use this rmk/for-armsoc as a baseline and merge the fixes already in
Linus' tree on top of it or the other way around?
Maybe it is preferable that I wait for 3.3-rc2 and merge rmk/for-armsoc
on top of it. This result can be the base of our AT91 work for 3.4
preparation.
Your thought?
Best regards,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 11+ messages in thread
* ARM/ARM-SoC plans for v3.4 merge window
2012-01-30 10:08 ` Nicolas Ferre
@ 2012-02-08 1:18 ` Olof Johansson
2012-02-08 11:52 ` Nicolas Ferre
0 siblings, 1 reply; 11+ messages in thread
From: Olof Johansson @ 2012-02-08 1:18 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Mon, Jan 30, 2012 at 2:08 AM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
> On 01/29/2012 12:57 AM, Olof Johansson :
>> Hi,
>>
>>
>> On Thu, Jan 26, 2012 at 1:23 PM, Russell King - ARM Linux
>> <linux@arm.linux.org.uk> wrote:
>>
>>
>>> And we're now there. ?So...
>>>
>>> Arnd, Olaf,
>>>
>>> Please incorporate the latest ARM (for-armsoc branch) changes, which can be found at:
>>>
>>> ? ? ? ?git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git for-armsoc
>>>
>>> with SHA1 dcf81c1af839b77b44404453ecae6e5ac5a75f05.
>>
>> Thanks. I have added this as depends/rmk/for-armsoc in the arm-soc repo.
>>
>> Any next/ branch we start will have this as the base of said branch,
>> so any vendor branches must either already be developed against this
>> stable branch, or merge on top of this with minimal conflicts.
>
> Ok, great.
>
> I just let you know that there is a conflict between the current Linus'
> tree (with recently updated at91 fixes) and this rmk/for-armsoc branch.
>
> I can give you the resolution of this conflict easily but I would like
> to know which way I execute the merge:
>
> I use this rmk/for-armsoc as a baseline and merge the fixes already in
> Linus' tree on top of it or the other way around?
>
> Maybe it is preferable that I wait for 3.3-rc2 and merge rmk/for-armsoc
> on top of it. This result can be the base of our AT91 work for 3.4
> preparation.
>
> Your thought?
I missed replying to this email until now when I started looking at
picking up branches for the 3.4 staging, sorry for the delay.
Russell, would you prefer merging in v3.3-rc2 into your branch so I
can pull the exact same resolution from there, or should we do it
locally in arm-soc? It probably makes sense for you to do it so
there's no more conflicts from there on out for dependent branches.
-Olof
^ permalink raw reply [flat|nested] 11+ messages in thread
* ARM/ARM-SoC plans for v3.4 merge window
2012-02-08 1:18 ` Olof Johansson
@ 2012-02-08 11:52 ` Nicolas Ferre
2012-02-09 1:19 ` Olof Johansson
0 siblings, 1 reply; 11+ messages in thread
From: Nicolas Ferre @ 2012-02-08 11:52 UTC (permalink / raw)
To: linux-arm-kernel
On 02/08/2012 02:18 AM, Olof Johansson :
> Hi,
>
> On Mon, Jan 30, 2012 at 2:08 AM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
>> On 01/29/2012 12:57 AM, Olof Johansson :
>>> Hi,
>>>
>>>
>>> On Thu, Jan 26, 2012 at 1:23 PM, Russell King - ARM Linux
>>> <linux@arm.linux.org.uk> wrote:
>>>
>>>
>>>> And we're now there. So...
>>>>
>>>> Arnd, Olaf,
>>>>
>>>> Please incorporate the latest ARM (for-armsoc branch) changes, which can be found at:
>>>>
>>>> git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git for-armsoc
>>>>
>>>> with SHA1 dcf81c1af839b77b44404453ecae6e5ac5a75f05.
>>>
>>> Thanks. I have added this as depends/rmk/for-armsoc in the arm-soc repo.
>>>
>>> Any next/ branch we start will have this as the base of said branch,
>>> so any vendor branches must either already be developed against this
>>> stable branch, or merge on top of this with minimal conflicts.
>>
>> Ok, great.
>>
>> I just let you know that there is a conflict between the current Linus'
>> tree (with recently updated at91 fixes) and this rmk/for-armsoc branch.
>>
>> I can give you the resolution of this conflict easily but I would like
>> to know which way I execute the merge:
>>
>> I use this rmk/for-armsoc as a baseline and merge the fixes already in
>> Linus' tree on top of it or the other way around?
>>
>> Maybe it is preferable that I wait for 3.3-rc2 and merge rmk/for-armsoc
>> on top of it. This result can be the base of our AT91 work for 3.4
>> preparation.
>>
>> Your thought?
>
> I missed replying to this email until now when I started looking at
> picking up branches for the 3.4 staging, sorry for the delay.
>
> Russell, would you prefer merging in v3.3-rc2 into your branch so I
> can pull the exact same resolution from there, or should we do it
> locally in arm-soc? It probably makes sense for you to do it so
> there's no more conflicts from there on out for dependent branches.
Olof,
For your information the conflict resolution is already present in
linux-next (and in my 3.4 preparation branches actually).
Best regards,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 11+ messages in thread
* ARM/ARM-SoC plans for v3.4 merge window
2012-02-08 11:52 ` Nicolas Ferre
@ 2012-02-09 1:19 ` Olof Johansson
0 siblings, 0 replies; 11+ messages in thread
From: Olof Johansson @ 2012-02-09 1:19 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Feb 8, 2012 at 3:52 AM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
> On 02/08/2012 02:18 AM, Olof Johansson :
>> Hi,
>>
>> On Mon, Jan 30, 2012 at 2:08 AM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
>>> On 01/29/2012 12:57 AM, Olof Johansson :
>>>> Hi,
>>>>
>>>>
>>>> On Thu, Jan 26, 2012 at 1:23 PM, Russell King - ARM Linux
>>>> <linux@arm.linux.org.uk> wrote:
>>>>
>>>>
>>>>> And we're now there. ?So...
>>>>>
>>>>> Arnd, Olaf,
>>>>>
>>>>> Please incorporate the latest ARM (for-armsoc branch) changes, which can be found at:
>>>>>
>>>>> ? ? ? ?git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git for-armsoc
>>>>>
>>>>> with SHA1 dcf81c1af839b77b44404453ecae6e5ac5a75f05.
>>>>
>>>> Thanks. I have added this as depends/rmk/for-armsoc in the arm-soc repo.
>>>>
>>>> Any next/ branch we start will have this as the base of said branch,
>>>> so any vendor branches must either already be developed against this
>>>> stable branch, or merge on top of this with minimal conflicts.
>>>
>>> Ok, great.
>>>
>>> I just let you know that there is a conflict between the current Linus'
>>> tree (with recently updated at91 fixes) and this rmk/for-armsoc branch.
>>>
>>> I can give you the resolution of this conflict easily but I would like
>>> to know which way I execute the merge:
>>>
>>> I use this rmk/for-armsoc as a baseline and merge the fixes already in
>>> Linus' tree on top of it or the other way around?
>>>
>>> Maybe it is preferable that I wait for 3.3-rc2 and merge rmk/for-armsoc
>>> on top of it. This result can be the base of our AT91 work for 3.4
>>> preparation.
>>>
>>> Your thought?
>>
>> I missed replying to this email until now when I started looking at
>> picking up branches for the 3.4 staging, sorry for the delay.
>>
>> Russell, would you prefer merging in v3.3-rc2 into your branch so I
>> can pull the exact same resolution from there, or should we do it
>> locally in arm-soc? It probably makes sense for you to do it so
>> there's no more conflicts from there on out for dependent branches.
>
> Olof,
>
> For your information the conflict resolution is already present in
> linux-next (and in my 3.4 preparation branches actually).
Yeah, it's just convenient if it's resolved once in the base branch
instead of every time we pull in something based on it.
I've pulled in and resolved the conflict with v3.3-rc2 into
depends/rmk/for-armsoc now so it should be covered for anyone basing
new branches off of it.
Thanks,
-Olof
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-02-09 1:19 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-23 11:49 ARM/ARM-SoC plans for v3.4 merge window Russell King - ARM Linux
2012-01-24 9:50 ` Russell King - ARM Linux
2012-01-24 10:56 ` Will Deacon
2012-01-24 11:27 ` Russell King - ARM Linux
2012-01-24 11:45 ` Will Deacon
2012-01-26 21:23 ` Russell King - ARM Linux
2012-01-28 23:57 ` Olof Johansson
2012-01-30 10:08 ` Nicolas Ferre
2012-02-08 1:18 ` Olof Johansson
2012-02-08 11:52 ` Nicolas Ferre
2012-02-09 1:19 ` Olof Johansson
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).