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

2013-10-29 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-omap2/opp.c between commit e4db1c7439b3 (PM / OPP: rename header to linux/pm_opp.h) from the pm tree and commit 92d51856d740 (ARM: OMAP3+: do not register non-dt OPP tables for device tree boot) from the arm-soc

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

2013-10-29 Thread Rafael J. Wysocki
On Tuesday, October 29, 2013 07:00:21 PM Stephen Rothwell wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-omap2/opp.c between commit e4db1c7439b3 (PM / OPP: rename header to linux/pm_opp.h) from the pm tree and commit 92d51856d740 (ARM: OMAP3+: do

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

2013-09-10 Thread Lorenzo Pieralisi
On Mon, Sep 09, 2013 at 06:22:16PM +0100, Kevin Hilman wrote: On Mon, Sep 2, 2013 at 11:09 AM, Lorenzo Pieralisi lorenzo.pieral...@arm.com wrote: On Thu, Aug 29, 2013 at 06:57:15PM +0100, Olof Johansson wrote: On Thu, Aug 29, 2013 at 06:04:25PM +1000, Stephen Rothwell wrote: Hi all,

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

2013-09-09 Thread Kevin Hilman
On Mon, Sep 2, 2013 at 11:09 AM, Lorenzo Pieralisi lorenzo.pieral...@arm.com wrote: On Thu, Aug 29, 2013 at 06:57:15PM +0100, Olof Johansson wrote: On Thu, Aug 29, 2013 at 06:04:25PM +1000, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in

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

2013-09-02 Thread Lorenzo Pieralisi
On Thu, Aug 29, 2013 at 06:57:15PM +0100, Olof Johansson wrote: On Thu, Aug 29, 2013 at 06:04:25PM +1000, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/cpuidle/Makefile between commits b98e01ad4ed9 (cpuidle: Add Kconfig.arm and

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

2013-08-29 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/cpuidle/Makefile between commits b98e01ad4ed9 (cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq) and d3f2950f2ade (ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle) from the pm tree and

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

2013-08-29 Thread Olof Johansson
On Thu, Aug 29, 2013 at 06:04:25PM +1000, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/cpuidle/Makefile between commits b98e01ad4ed9 (cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq) and d3f2950f2ade (ARM: ux500:

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

2013-08-27 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-mvebu/platsmp.c between commit f6cec7cd0777 (ARM: mvebu: remove device tree parsing for cpu nodes) from the tree and commit 994c8c94b419 (ARM: mvebu: Remove the harcoded BootROM window allocation) from the

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

2013-08-27 Thread Kevin Hilman
Stephen Rothwell s...@canb.auug.org.au writes: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-mvebu/platsmp.c between commit f6cec7cd0777 (ARM: mvebu: remove device tree parsing for cpu nodes) from the tree and commit 994c8c94b419 (ARM: mvebu: Remove

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

2013-04-25 Thread Kukjin Kim
On 04/24/13 15:54, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-exynos/cpuidle.c between commit 554c06ba3ee2 (cpuidle: remove en_core_tk_irqen flag) from the pm tree and commit 2eb89f893e44 (ARM: EXYNOS: factor out the idle states)

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

2013-04-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-exynos/cpuidle.c between commit 554c06ba3ee2 (cpuidle: remove en_core_tk_irqen flag) from the pm tree and commit 2eb89f893e44 (ARM: EXYNOS: factor out the idle states) from the arm-soc tree. I fixed it up (see

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

2013-04-19 Thread Kukjin Kim
Olof Johansson wrote: On Wed, Apr 10, 2013 at 05:36:49PM +0900, Kukjin Kim wrote: Stephen Rothwell wrote: Hi all, Hi, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-s3c24xx/Kconfig between commit 785f40040874 (cpufreq: s3c24xx: move cpufreq

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

2013-04-11 Thread Olof Johansson
On Wed, Apr 10, 2013 at 05:36:49PM +0900, Kukjin Kim wrote: Stephen Rothwell wrote: Hi all, Hi, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-s3c24xx/Kconfig between commit 785f40040874 (cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq) from

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

2013-04-10 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-s3c24xx/Kconfig between commit 785f40040874 (cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq) from the pm tree and commits fb278af74b28 (ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410) and

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

2013-04-10 Thread Kukjin Kim
Stephen Rothwell wrote: Hi all, Hi, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-s3c24xx/Kconfig between commit 785f40040874 (cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq) from the pm tree and As I know, Rafael will drop it in his tree.

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

2012-09-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/include/mach/common.h between commit 35f2b0bd5911 (ARM: shmobile: Move definition of shmobile_init_late() to header) from the pm tree and commit a62580e58065 (ARM: SoC: convert shmobile SMP to SMP

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

2012-09-24 Thread Olof Johansson
Hi, On Mon, Sep 24, 2012 at 2:21 AM, Stephen Rothwell s...@canb.auug.org.au wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-shmobile/include/mach/common.h between commit 35f2b0bd5911 (ARM: shmobile: Move definition of shmobile_init_late() to