Re: linux-next: manual merge of the arm-soc tree with the pm tree
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 not register non-dt OPP tables for device tree boot")
> from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
The fix looks good to me, thanks for fixing this up.
Rafael
signature.asc
Description: This is a digitally signed message part.
Re: linux-next: manual merge of the arm-soc tree with the pm tree
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 not register non-dt OPP tables for device tree boot) from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). The fix looks good to me, thanks for fixing this up. Rafael signature.asc Description: This is a digitally signed message part.
Re: linux-next: manual merge of the arm-soc tree with the pm tree
On Mon, Sep 09, 2013 at 06:22:16PM +0100, Kevin Hilman wrote:
> On Mon, Sep 2, 2013 at 11:09 AM, Lorenzo Pieralisi
> 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
> >> > 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 commit 14d2c34cfa00 ("cpuidle: big.LITTLE: vexpress-TC2 CPU
> >> > idle driver") from the arm-soc tree.
> >> >
> >> > I fixed it up (see below) and can carry the fix as necessary (no action
> >> > is required).
> >> >
> >> > --
> >> > Cheers,
> >> > Stephen Rothwells...@canb.auug.org.au
> >> >
> >> > diff --cc drivers/cpuidle/Makefile
> >> > index 0b9d200,3b6445c..000
> >> > --- a/drivers/cpuidle/Makefile
> >> > +++ b/drivers/cpuidle/Makefile
> >> > @@@ -5,9 -5,7 +5,10 @@@
> >> > obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
> >> > obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
> >> >
> >> > -obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
> >> > -obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
> >> > -obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.o
> >> > -obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o
> >> >
> >> > +##
> >> > +# ARM SoC drivers
> >> > +obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE)+= cpuidle-calxeda.o
> >> > +obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)+= cpuidle-kirkwood.o
> >> > +obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)+= cpuidle-zynq.o
> >> > +obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o
> >> > ++obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o
> >>
> >>
> >> Might want to sort u8500 before zynq, but otherwise looks fine.
> >
> > I noticed that owing to the merge, CONFIG_CPU_IDLE_BIG_LITTLE should be
> > moved
> > to the newly introduced Kconfig.arm. How are we going to handle this ? It is
> > just a matter of renaming the config entry and moving it to Kconfig.arm.
> >
>
> For the merge window, we'll merge it as is, but a rename
> cleanup/rename patch for v3.12-rc would be appreciated.
Agreed, thanks Kevin.
Lorenzo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
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, 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 commit 14d2c34cfa00 (cpuidle: big.LITTLE: vexpress-TC2 CPU idle driver) from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/cpuidle/Makefile index 0b9d200,3b6445c..000 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile @@@ -5,9 -5,7 +5,10 @@@ obj-y += cpuidle.o driver.o governor.o sysfs.o governors/ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o -obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o -obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o -obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.o -obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o +## +# ARM SoC drivers +obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE)+= cpuidle-calxeda.o +obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)+= cpuidle-kirkwood.o +obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)+= cpuidle-zynq.o +obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o ++obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o Might want to sort u8500 before zynq, but otherwise looks fine. I noticed that owing to the merge, CONFIG_CPU_IDLE_BIG_LITTLE should be moved to the newly introduced Kconfig.arm. How are we going to handle this ? It is just a matter of renaming the config entry and moving it to Kconfig.arm. For the merge window, we'll merge it as is, but a rename cleanup/rename patch for v3.12-rc would be appreciated. Agreed, thanks Kevin. Lorenzo -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
On Mon, Sep 2, 2013 at 11:09 AM, Lorenzo Pieralisi
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
>> > 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 commit 14d2c34cfa00 ("cpuidle: big.LITTLE: vexpress-TC2 CPU
>> > idle driver") from the arm-soc tree.
>> >
>> > I fixed it up (see below) and can carry the fix as necessary (no action
>> > is required).
>> >
>> > --
>> > Cheers,
>> > Stephen Rothwells...@canb.auug.org.au
>> >
>> > diff --cc drivers/cpuidle/Makefile
>> > index 0b9d200,3b6445c..000
>> > --- a/drivers/cpuidle/Makefile
>> > +++ b/drivers/cpuidle/Makefile
>> > @@@ -5,9 -5,7 +5,10 @@@
>> > obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
>> > obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
>> >
>> > -obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
>> > -obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
>> > -obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.o
>> > -obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o
>> >
>> > +##
>> > +# ARM SoC drivers
>> > +obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE)+= cpuidle-calxeda.o
>> > +obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)+= cpuidle-kirkwood.o
>> > +obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)+= cpuidle-zynq.o
>> > +obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o
>> > ++obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o
>>
>>
>> Might want to sort u8500 before zynq, but otherwise looks fine.
>
> I noticed that owing to the merge, CONFIG_CPU_IDLE_BIG_LITTLE should be moved
> to the newly introduced Kconfig.arm. How are we going to handle this ? It is
> just a matter of renaming the config entry and moving it to Kconfig.arm.
>
For the merge window, we'll merge it as is, but a rename
cleanup/rename patch for v3.12-rc would be appreciated.
Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
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 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 commit 14d2c34cfa00 (cpuidle: big.LITTLE: vexpress-TC2 CPU idle driver) from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/cpuidle/Makefile index 0b9d200,3b6445c..000 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile @@@ -5,9 -5,7 +5,10 @@@ obj-y += cpuidle.o driver.o governor.o sysfs.o governors/ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o -obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o -obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o -obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.o -obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o +## +# ARM SoC drivers +obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE)+= cpuidle-calxeda.o +obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)+= cpuidle-kirkwood.o +obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)+= cpuidle-zynq.o +obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o ++obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o Might want to sort u8500 before zynq, but otherwise looks fine. I noticed that owing to the merge, CONFIG_CPU_IDLE_BIG_LITTLE should be moved to the newly introduced Kconfig.arm. How are we going to handle this ? It is just a matter of renaming the config entry and moving it to Kconfig.arm. For the merge window, we'll merge it as is, but a rename cleanup/rename patch for v3.12-rc would be appreciated. Kevin -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
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 move calxeda, kirkwood and zynq") and d3f2950f2ade ("ARM:
> > ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle") from the
> > pm tree and commit 14d2c34cfa00 ("cpuidle: big.LITTLE: vexpress-TC2 CPU
> > idle driver") from the arm-soc tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> >
> > --
> > Cheers,
> > Stephen Rothwells...@canb.auug.org.au
> >
> > diff --cc drivers/cpuidle/Makefile
> > index 0b9d200,3b6445c..000
> > --- a/drivers/cpuidle/Makefile
> > +++ b/drivers/cpuidle/Makefile
> > @@@ -5,9 -5,7 +5,10 @@@
> > obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
> > obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
> >
> > -obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
> > -obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
> > -obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.o
> > -obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o
> >
> > +##
> > +# ARM SoC drivers
> > +obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE)+= cpuidle-calxeda.o
> > +obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)+= cpuidle-kirkwood.o
> > +obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)+= cpuidle-zynq.o
> > +obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o
> > ++obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o
>
>
> Might want to sort u8500 before zynq, but otherwise looks fine.
I noticed that owing to the merge, CONFIG_CPU_IDLE_BIG_LITTLE should be moved
to the newly introduced Kconfig.arm. How are we going to handle this ? It is
just a matter of renaming the config entry and moving it to Kconfig.arm.
Thanks,
Lorenzo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
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 move calxeda, kirkwood and zynq) and d3f2950f2ade (ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle) from the pm tree and commit 14d2c34cfa00 (cpuidle: big.LITTLE: vexpress-TC2 CPU idle driver) from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/cpuidle/Makefile index 0b9d200,3b6445c..000 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile @@@ -5,9 -5,7 +5,10 @@@ obj-y += cpuidle.o driver.o governor.o sysfs.o governors/ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o -obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o -obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o -obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.o -obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o +## +# ARM SoC drivers +obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE)+= cpuidle-calxeda.o +obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)+= cpuidle-kirkwood.o +obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)+= cpuidle-zynq.o +obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o ++obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o Might want to sort u8500 before zynq, but otherwise looks fine. I noticed that owing to the merge, CONFIG_CPU_IDLE_BIG_LITTLE should be moved to the newly introduced Kconfig.arm. How are we going to handle this ? It is just a matter of renaming the config entry and moving it to Kconfig.arm. Thanks, Lorenzo -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
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: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle") from the
> pm tree and commit 14d2c34cfa00 ("cpuidle: big.LITTLE: vexpress-TC2 CPU
> idle driver") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
>
> diff --cc drivers/cpuidle/Makefile
> index 0b9d200,3b6445c..000
> --- a/drivers/cpuidle/Makefile
> +++ b/drivers/cpuidle/Makefile
> @@@ -5,9 -5,7 +5,10 @@@
> obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
> obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
>
> -obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
> -obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
> -obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.o
> -obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o
>
> +##
> +# ARM SoC drivers
> +obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE) += cpuidle-calxeda.o
> +obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE) += cpuidle-kirkwood.o
> +obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o
> +obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o
> ++obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o
Might want to sort u8500 before zynq, but otherwise looks fine.
-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
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: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle) from the pm tree and commit 14d2c34cfa00 (cpuidle: big.LITTLE: vexpress-TC2 CPU idle driver) from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/cpuidle/Makefile index 0b9d200,3b6445c..000 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile @@@ -5,9 -5,7 +5,10 @@@ obj-y += cpuidle.o driver.o governor.o sysfs.o governors/ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o -obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o -obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o -obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.o -obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o +## +# ARM SoC drivers +obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE) += cpuidle-calxeda.o +obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE) += cpuidle-kirkwood.o +obj-$(CONFIG_ARM_ZYNQ_CPUIDLE) += cpuidle-zynq.o +obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o ++obj-$(CONFIG_CPU_IDLE_BIG_LITTLE) += cpuidle-big_little.o Might want to sort u8500 before zynq, but otherwise looks fine. -Olof -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
Stephen Rothwell 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 the harcoded BootROM window
> allocation") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Fix looks correct, thanks.
Kevin (for arm-soc folks)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
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 the harcoded BootROM window allocation) from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). Fix looks correct, thanks. Kevin (for arm-soc folks) -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
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") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
Looks OK to me, thanks.
- Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
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) from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). Looks OK to me, thanks. - Kukjin -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: manual merge of the arm-soc tree with the pm tree
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 driver to drivers/cpufreq") from the pm tree and
> >
> > As I know, Rafael will drop it in his tree.
> > http://lists-archives.com/linux-kernel/27815851-cpufreq-s3c24xx-move-
> cpufreq
> > -driver-to-drivers-cpufreq.html
> >
> > > commits fb278af74b28 ("ARM: S3C24XX: Removed unneeded dependency on
> > > CPU_S3C2410") and a4e4d22c6f53 ("ARM: S3C24XX: Removed unneeded
> > > dependency on CPU_S3C2412") from the arm-soc tree.
> > >
> > > I fixed it up by removing the sections from arch/arm/mach-
> s3c24xx/Kconfig
> > > and can carry thefix as necessary (no action is required).
> > >
> > Thanks.
> >
> > > P.S. those arm-soc tree commits have a bad Author email address ...
> >
> > Oops :-( it's my fault due to e-mail client problem...
> >
> > Arnd, it happened in next/dt-exynos, next/mct-exynos and
> > next/cleanup-samsung branches in my tree.
> >
> > And I sorted out in my local just now. Could you please re-pull them
> into
> > arm-soc? Then, I will push forced. Sorry about that.
>
> Given that it's "just" formatting errors, I would prefer not repulling and
> rebuilding just because of it. For someone reading the information it's
Hmm...if possible, I'm still hoping, you could replace previous branches
which including 'wrong format' for author e-mail :-) But up to you.
> pretty
> obvious what the valid email address would be. Please try to be mindful of
> it
OK.
> in the future though (and we'll try to double-check these things too).
>
BTW, if you don't want to pull, I need to re-send for '[GIT PULL 4/4]
dt-exynos 2 for v3.10'...
But I'm not sure it's possible...
Anyway, sorry for noise.
- Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: manual merge of the arm-soc tree with the pm tree
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 driver to drivers/cpufreq) from the pm tree and As I know, Rafael will drop it in his tree. http://lists-archives.com/linux-kernel/27815851-cpufreq-s3c24xx-move- cpufreq -driver-to-drivers-cpufreq.html commits fb278af74b28 (ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410) and a4e4d22c6f53 (ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412) from the arm-soc tree. I fixed it up by removing the sections from arch/arm/mach- s3c24xx/Kconfig and can carry thefix as necessary (no action is required). Thanks. P.S. those arm-soc tree commits have a bad Author email address ... Oops :-( it's my fault due to e-mail client problem... Arnd, it happened in next/dt-exynos, next/mct-exynos and next/cleanup-samsung branches in my tree. And I sorted out in my local just now. Could you please re-pull them into arm-soc? Then, I will push forced. Sorry about that. Given that it's just formatting errors, I would prefer not repulling and rebuilding just because of it. For someone reading the information it's Hmm...if possible, I'm still hoping, you could replace previous branches which including 'wrong format' for author e-mail :-) But up to you. pretty obvious what the valid email address would be. Please try to be mindful of it OK. in the future though (and we'll try to double-check these things too). BTW, if you don't want to pull, I need to re-send for '[GIT PULL 4/4] dt-exynos 2 for v3.10'... But I'm not sure it's possible... Anyway, sorry for noise. - Kukjin -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
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 the pm tree and
>
> As I know, Rafael will drop it in his tree.
> http://lists-archives.com/linux-kernel/27815851-cpufreq-s3c24xx-move-cpufreq
> -driver-to-drivers-cpufreq.html
>
> > commits fb278af74b28 ("ARM: S3C24XX: Removed unneeded dependency on
> > CPU_S3C2410") and a4e4d22c6f53 ("ARM: S3C24XX: Removed unneeded
> > dependency on CPU_S3C2412") from the arm-soc tree.
> >
> > I fixed it up by removing the sections from arch/arm/mach-s3c24xx/Kconfig
> > and can carry thefix as necessary (no action is required).
> >
> Thanks.
>
> > P.S. those arm-soc tree commits have a bad Author email address ...
>
> Oops :-( it's my fault due to e-mail client problem...
>
> Arnd, it happened in next/dt-exynos, next/mct-exynos and
> next/cleanup-samsung branches in my tree.
>
> And I sorted out in my local just now. Could you please re-pull them into
> arm-soc? Then, I will push forced. Sorry about that.
Given that it's "just" formatting errors, I would prefer not repulling and
rebuilding just because of it. For someone reading the information it's pretty
obvious what the valid email address would be. Please try to be mindful of it
in the future though (and we'll try to double-check these things too).
-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
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 the pm tree and As I know, Rafael will drop it in his tree. http://lists-archives.com/linux-kernel/27815851-cpufreq-s3c24xx-move-cpufreq -driver-to-drivers-cpufreq.html commits fb278af74b28 (ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410) and a4e4d22c6f53 (ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412) from the arm-soc tree. I fixed it up by removing the sections from arch/arm/mach-s3c24xx/Kconfig and can carry thefix as necessary (no action is required). Thanks. P.S. those arm-soc tree commits have a bad Author email address ... Oops :-( it's my fault due to e-mail client problem... Arnd, it happened in next/dt-exynos, next/mct-exynos and next/cleanup-samsung branches in my tree. And I sorted out in my local just now. Could you please re-pull them into arm-soc? Then, I will push forced. Sorry about that. Given that it's just formatting errors, I would prefer not repulling and rebuilding just because of it. For someone reading the information it's pretty obvious what the valid email address would be. Please try to be mindful of it in the future though (and we'll try to double-check these things too). -Olof -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: manual merge of the arm-soc tree with the pm tree
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.
http://lists-archives.com/linux-kernel/27815851-cpufreq-s3c24xx-move-cpufreq
-driver-to-drivers-cpufreq.html
> commits fb278af74b28 ("ARM: S3C24XX: Removed unneeded dependency on
> CPU_S3C2410") and a4e4d22c6f53 ("ARM: S3C24XX: Removed unneeded
> dependency on CPU_S3C2412") from the arm-soc tree.
>
> I fixed it up by removing the sections from arch/arm/mach-s3c24xx/Kconfig
> and can carry thefix as necessary (no action is required).
>
Thanks.
> P.S. those arm-soc tree commits have a bad Author email address ...
Oops :-( it's my fault due to e-mail client problem...
Arnd, it happened in next/dt-exynos, next/mct-exynos and
next/cleanup-samsung branches in my tree.
And I sorted out in my local just now. Could you please re-pull them into
arm-soc? Then, I will push forced. Sorry about that.
- Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
RE: linux-next: manual merge of the arm-soc tree with the pm tree
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. http://lists-archives.com/linux-kernel/27815851-cpufreq-s3c24xx-move-cpufreq -driver-to-drivers-cpufreq.html commits fb278af74b28 (ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410) and a4e4d22c6f53 (ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412) from the arm-soc tree. I fixed it up by removing the sections from arch/arm/mach-s3c24xx/Kconfig and can carry thefix as necessary (no action is required). Thanks. P.S. those arm-soc tree commits have a bad Author email address ... Oops :-( it's my fault due to e-mail client problem... Arnd, it happened in next/dt-exynos, next/mct-exynos and next/cleanup-samsung branches in my tree. And I sorted out in my local just now. Could you please re-pull them into arm-soc? Then, I will push forced. Sorry about that. - Kukjin -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
Hi,
On Mon, Sep 24, 2012 at 2:21 AM, Stephen Rothwell 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 header") from
> the pm tree and commit a62580e58065 ("ARM: SoC: convert shmobile SMP to
> SMP operations") from the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Hmm.
Rafael, the shmobile SoC-specific code in your tree looks like it
should have been merged through arm-soc? That way we could have
resolved the conflicts locally without having it spill out into other
trees (and thus seen by both sfr and Linus when the branches goes up
to him).
-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the pm tree
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 header) from the pm tree and commit a62580e58065 (ARM: SoC: convert shmobile SMP to SMP operations) from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). Hmm. Rafael, the shmobile SoC-specific code in your tree looks like it should have been merged through arm-soc? That way we could have resolved the conflicts locally without having it spill out into other trees (and thus seen by both sfr and Linus when the branches goes up to him). -Olof -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
