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:
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
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
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
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,
> >> >
> >> >
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,
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
>> >
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
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
> >
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
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:
>
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
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
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:
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
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
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
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
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
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)
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
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
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:
>
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
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
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
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.
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
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
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.
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
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
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
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
34 matches
Mail list logo