* Git pull request: Orion/Kirkwood/Dove stuff for next merge window
@ 2009-11-27 1:13 Nicolas Pitre
2009-11-30 16:23 ` Nicolas Pitre
0 siblings, 1 reply; 7+ messages in thread
From: Nicolas Pitre @ 2009-11-27 1:13 UTC (permalink / raw)
To: linux-arm-kernel
Russell, please pull the following:
git://git.marvell.com/orion for-rmk
This contains updates for Kirkwood and addition of support for the Dove
SOC.
Lennert Buytenhek (1):
ARM: Add Tauros2 L2 cache controller support
Martin Michlmayr (4):
[ARM] Kirkwood: Add support for QNAP TS-41x Turbo NAS
[ARM] Kirkwood: Add MPP36 for QNAP TS-11x/TS-21x
[ARM] Kirkwood: Add QNAP TS-110/TS-210 to Kconfig help text
[ARM] Kirkwood: Remove code duplication in QNAP setup files
Saeed Bishara (2):
ARM: add base support for Marvell Dove SoC
RTC: let Dove soc select the rtc-mv driver.
arch/arm/Kconfig | 13 +
arch/arm/Makefile | 1 +
arch/arm/boot/compressed/head.S | 6 +
arch/arm/configs/dove_defconfig | 1620 +++++++++++++++++++
arch/arm/include/asm/hardware/cache-tauros2.h | 11 +
arch/arm/mach-dove/Kconfig | 14 +
arch/arm/mach-dove/Makefile | 3 +
arch/arm/mach-dove/Makefile.boot | 3 +
arch/arm/mach-dove/addr-map.c | 149 ++
arch/arm/mach-dove/common.c | 781 +++++++++
arch/arm/mach-dove/common.h | 40 +
arch/arm/mach-dove/dove-db-setup.c | 102 ++
arch/arm/mach-dove/include/mach/bridge-regs.h | 58 +
arch/arm/mach-dove/include/mach/debug-macro.S | 20 +
arch/arm/mach-dove/include/mach/dove.h | 180 ++
arch/arm/mach-dove/include/mach/entry-macro.S | 39 +
arch/arm/mach-dove/include/mach/gpio.h | 49 +
arch/arm/mach-dove/include/mach/hardware.h | 26 +
arch/arm/mach-dove/include/mach/io.h | 20 +
arch/arm/mach-dove/include/mach/irqs.h | 101 ++
arch/arm/mach-dove/include/mach/memory.h | 10 +
arch/arm/mach-dove/include/mach/pm.h | 54 +
arch/arm/mach-dove/include/mach/system.h | 36 +
arch/arm/mach-dove/include/mach/timex.h | 9 +
arch/arm/mach-dove/include/mach/uncompress.h | 37 +
arch/arm/mach-dove/include/mach/vmalloc.h | 5 +
arch/arm/mach-dove/irq.c | 133 ++
arch/arm/mach-dove/pcie.c | 238 +++
arch/arm/mach-kirkwood/Kconfig | 12 +-
arch/arm/mach-kirkwood/Makefile | 3 +-
arch/arm/mach-kirkwood/ts219-setup.c | 108 +--
arch/arm/mach-kirkwood/ts41x-setup.c | 154 ++
arch/arm/mach-kirkwood/tsx1x-common.c | 113 ++
arch/arm/mach-kirkwood/tsx1x-common.h | 7 +
arch/arm/mm/Kconfig | 11 +-
arch/arm/mm/Makefile | 2 +-
arch/arm/mm/cache-tauros2.c | 263 +++
arch/arm/mm/proc-v6.S | 33 +-
drivers/rtc/Kconfig | 2 +-
39 files changed, 4356 insertions(+), 110 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Git pull request: Orion/Kirkwood/Dove stuff for next merge window
2009-11-27 1:13 Git pull request: Orion/Kirkwood/Dove stuff for next merge window Nicolas Pitre
@ 2009-11-30 16:23 ` Nicolas Pitre
2009-11-30 16:30 ` Russell King - ARM Linux
0 siblings, 1 reply; 7+ messages in thread
From: Nicolas Pitre @ 2009-11-30 16:23 UTC (permalink / raw)
To: linux-arm-kernel
Ping.
On Thu, 26 Nov 2009, Nicolas Pitre wrote:
> Russell, please pull the following:
>
> git://git.marvell.com/orion for-rmk
>
> This contains updates for Kirkwood and addition of support for the Dove
> SOC.
>
> Lennert Buytenhek (1):
> ARM: Add Tauros2 L2 cache controller support
>
> Martin Michlmayr (4):
> [ARM] Kirkwood: Add support for QNAP TS-41x Turbo NAS
> [ARM] Kirkwood: Add MPP36 for QNAP TS-11x/TS-21x
> [ARM] Kirkwood: Add QNAP TS-110/TS-210 to Kconfig help text
> [ARM] Kirkwood: Remove code duplication in QNAP setup files
>
> Saeed Bishara (2):
> ARM: add base support for Marvell Dove SoC
> RTC: let Dove soc select the rtc-mv driver.
>
> arch/arm/Kconfig | 13 +
> arch/arm/Makefile | 1 +
> arch/arm/boot/compressed/head.S | 6 +
> arch/arm/configs/dove_defconfig | 1620 +++++++++++++++++++
> arch/arm/include/asm/hardware/cache-tauros2.h | 11 +
> arch/arm/mach-dove/Kconfig | 14 +
> arch/arm/mach-dove/Makefile | 3 +
> arch/arm/mach-dove/Makefile.boot | 3 +
> arch/arm/mach-dove/addr-map.c | 149 ++
> arch/arm/mach-dove/common.c | 781 +++++++++
> arch/arm/mach-dove/common.h | 40 +
> arch/arm/mach-dove/dove-db-setup.c | 102 ++
> arch/arm/mach-dove/include/mach/bridge-regs.h | 58 +
> arch/arm/mach-dove/include/mach/debug-macro.S | 20 +
> arch/arm/mach-dove/include/mach/dove.h | 180 ++
> arch/arm/mach-dove/include/mach/entry-macro.S | 39 +
> arch/arm/mach-dove/include/mach/gpio.h | 49 +
> arch/arm/mach-dove/include/mach/hardware.h | 26 +
> arch/arm/mach-dove/include/mach/io.h | 20 +
> arch/arm/mach-dove/include/mach/irqs.h | 101 ++
> arch/arm/mach-dove/include/mach/memory.h | 10 +
> arch/arm/mach-dove/include/mach/pm.h | 54 +
> arch/arm/mach-dove/include/mach/system.h | 36 +
> arch/arm/mach-dove/include/mach/timex.h | 9 +
> arch/arm/mach-dove/include/mach/uncompress.h | 37 +
> arch/arm/mach-dove/include/mach/vmalloc.h | 5 +
> arch/arm/mach-dove/irq.c | 133 ++
> arch/arm/mach-dove/pcie.c | 238 +++
> arch/arm/mach-kirkwood/Kconfig | 12 +-
> arch/arm/mach-kirkwood/Makefile | 3 +-
> arch/arm/mach-kirkwood/ts219-setup.c | 108 +--
> arch/arm/mach-kirkwood/ts41x-setup.c | 154 ++
> arch/arm/mach-kirkwood/tsx1x-common.c | 113 ++
> arch/arm/mach-kirkwood/tsx1x-common.h | 7 +
> arch/arm/mm/Kconfig | 11 +-
> arch/arm/mm/Makefile | 2 +-
> arch/arm/mm/cache-tauros2.c | 263 +++
> arch/arm/mm/proc-v6.S | 33 +-
> drivers/rtc/Kconfig | 2 +-
> 39 files changed, 4356 insertions(+), 110 deletions(-)
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Git pull request: Orion/Kirkwood/Dove stuff for next merge window
2009-11-30 16:23 ` Nicolas Pitre
@ 2009-11-30 16:30 ` Russell King - ARM Linux
2009-12-01 9:56 ` Russell King - ARM Linux
0 siblings, 1 reply; 7+ messages in thread
From: Russell King - ARM Linux @ 2009-11-30 16:30 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 30, 2009 at 11:23:49AM -0500, Nicolas Pitre wrote:
> Ping.
Not pulling just yet.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Git pull request: Orion/Kirkwood/Dove stuff for next merge window
2009-11-30 16:30 ` Russell King - ARM Linux
@ 2009-12-01 9:56 ` Russell King - ARM Linux
2009-12-01 17:48 ` Nicolas Pitre
0 siblings, 1 reply; 7+ messages in thread
From: Russell King - ARM Linux @ 2009-12-01 9:56 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 30, 2009 at 04:30:11PM +0000, Russell King - ARM Linux wrote:
> On Mon, Nov 30, 2009 at 11:23:49AM -0500, Nicolas Pitre wrote:
> > Ping.
>
> Not pulling just yet.
I'm sorry, I can't pull with this dove db crap in. The machine database
is in a mess with respect to it - there's at least two dove_db machine IDs
registered.
Saeed needs to talk to me to get it sorted _first_ before submitting it
for mainline. Please drop it from your tree.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Git pull request: Orion/Kirkwood/Dove stuff for next merge window
2009-12-01 9:56 ` Russell King - ARM Linux
@ 2009-12-01 17:48 ` Nicolas Pitre
2009-12-01 18:03 ` Russell King - ARM Linux
0 siblings, 1 reply; 7+ messages in thread
From: Nicolas Pitre @ 2009-12-01 17:48 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 1 Dec 2009, Russell King - ARM Linux wrote:
> On Mon, Nov 30, 2009 at 04:30:11PM +0000, Russell King - ARM Linux wrote:
> > On Mon, Nov 30, 2009 at 11:23:49AM -0500, Nicolas Pitre wrote:
> > > Ping.
> >
> > Not pulling just yet.
>
> I'm sorry, I can't pull with this dove db crap in. The machine database
> is in a mess with respect to it - there's at least two dove_db machine IDs
> registered.
>
> Saeed needs to talk to me to get it sorted _first_ before submitting it
> for mainline. Please drop it from your tree.
Given that the second dove_db should be renamed to dove_db2 according to
Saeed (and I think you made the change already) then are you OK to pull
it as is now?
Nicolas
^ permalink raw reply [flat|nested] 7+ messages in thread
* Git pull request: Orion/Kirkwood/Dove stuff for next merge window
2009-12-01 17:48 ` Nicolas Pitre
@ 2009-12-01 18:03 ` Russell King - ARM Linux
2009-12-01 19:23 ` Nicolas Pitre
0 siblings, 1 reply; 7+ messages in thread
From: Russell King - ARM Linux @ 2009-12-01 18:03 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Dec 01, 2009 at 12:48:42PM -0500, Nicolas Pitre wrote:
> On Tue, 1 Dec 2009, Russell King - ARM Linux wrote:
>
> > On Mon, Nov 30, 2009 at 04:30:11PM +0000, Russell King - ARM Linux wrote:
> > > On Mon, Nov 30, 2009 at 11:23:49AM -0500, Nicolas Pitre wrote:
> > > > Ping.
> > >
> > > Not pulling just yet.
> >
> > I'm sorry, I can't pull with this dove db crap in. The machine database
> > is in a mess with respect to it - there's at least two dove_db machine IDs
> > registered.
> >
> > Saeed needs to talk to me to get it sorted _first_ before submitting it
> > for mainline. Please drop it from your tree.
>
> Given that the second dove_db should be renamed to dove_db2 according to
> Saeed (and I think you made the change already) then are you OK to pull
> it as is now?
Err, eventually. I seem to have destroyed a number of commits in my tree,
thanks to having to wait for ages on people to verify stuff...
^ permalink raw reply [flat|nested] 7+ messages in thread
* Git pull request: Orion/Kirkwood/Dove stuff for next merge window
2009-12-01 18:03 ` Russell King - ARM Linux
@ 2009-12-01 19:23 ` Nicolas Pitre
0 siblings, 0 replies; 7+ messages in thread
From: Nicolas Pitre @ 2009-12-01 19:23 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 1 Dec 2009, Russell King - ARM Linux wrote:
> Err, eventually. I seem to have destroyed a number of commits in my tree,
> thanks to having to wait for ages on people to verify stuff...
You should be able to retrieve them through the reflogs (see output of
'git reflog'). Git makes it quite hard to actually destroy your data.
Everything is kept around for a while before being garbage collected.
Nicolas
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-12-01 19:23 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-27 1:13 Git pull request: Orion/Kirkwood/Dove stuff for next merge window Nicolas Pitre
2009-11-30 16:23 ` Nicolas Pitre
2009-11-30 16:30 ` Russell King - ARM Linux
2009-12-01 9:56 ` Russell King - ARM Linux
2009-12-01 17:48 ` Nicolas Pitre
2009-12-01 18:03 ` Russell King - ARM Linux
2009-12-01 19:23 ` Nicolas Pitre
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.