linux-next: manual merge of the arm-soc tree with the metag tree

2013-02-12 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/irqchip/Makefile between commit 270de53f851b ("metag: Internal and external irqchips") from the metag tree and commit a900e5d99718 ("ARM: exynos: move exynos4210-combiner to drivers/irqchip") from the arm-soc tree. I

Re: linux-next: manual merge of the arm-soc tree with the metag tree

2013-02-12 Thread Arnd Bergmann
On Tuesday 12 February 2013, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got conflicts in > drivers/clocksource/Makefile and drivers/clocksource/Kconfig between > commit 3fedb0674fbc ("metag: Time keeping") from the metag tree and > commits 8a4da6e36c58 ("arm:

Re: linux-next: manual merge of the arm-soc tree with the metag tree

2013-02-12 Thread Arnd Bergmann
On Tuesday 12 February 2013, Stephen Rothwell wrote: Today's linux-next merge of the arm-soc tree got conflicts in drivers/clocksource/Makefile and drivers/clocksource/Kconfig between commit 3fedb0674fbc (metag: Time keeping) from the metag tree and commits 8a4da6e36c58 (arm: arch_timer: move

linux-next: manual merge of the arm-soc tree with the metag tree

2013-02-12 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/irqchip/Makefile between commit 270de53f851b (metag: Internal and external irqchips) from the metag tree and commit a900e5d99718 (ARM: exynos: move exynos4210-combiner to drivers/irqchip) from the arm-soc tree. I

linux-next: manual merge of the arm-soc tree with the metag tree

2013-02-11 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got conflicts in drivers/clocksource/Makefile and drivers/clocksource/Kconfig between commit 3fedb0674fbc ("metag: Time keeping") from the metag tree and commits 8a4da6e36c58 ("arm: arch_timer: move core to drivers/clocksource") and ("arm64:

linux-next: manual merge of the arm-soc tree with the metag tree

2013-02-11 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got conflicts in drivers/clocksource/Makefile and drivers/clocksource/Kconfig between commit 3fedb0674fbc (metag: Time keeping) from the metag tree and commits 8a4da6e36c58 (arm: arch_timer: move core to drivers/clocksource) and (arm64: move