linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Olof Johansson <olof@lixom.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	Sahara <keun-o.park@windriver.com>,
	"Rafael J. Wysocki" <rjw@sisk.pl>,
	"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the pm tree
Date: Thu, 29 Aug 2013 10:57:15 -0700	[thread overview]
Message-ID: <20130829175715.GH18542@quad.lixom.net> (raw)
In-Reply-To: <20130829180425.4aa3d164f01cc65b215187fe@canb.auug.org.au>

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 Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/cpuidle/Makefile
> index 0b9d200,3b6445c..0000000
> --- 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

  reply	other threads:[~2013-08-29 17:57 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-29  8:04 linux-next: manual merge of the arm-soc tree with the pm tree Stephen Rothwell
2013-08-29 17:57 ` Olof Johansson [this message]
2013-09-02 18:09   ` Lorenzo Pieralisi
2013-09-09 17:22     ` Kevin Hilman
2013-09-10  8:59       ` Lorenzo Pieralisi
  -- strict thread matches above, loose matches on Subject: below --
2013-10-29  8:00 Stephen Rothwell
2013-10-29 12:08 ` Rafael J. Wysocki
2013-08-27  8:33 Stephen Rothwell
2013-08-27 15:30 ` Kevin Hilman
2013-04-24  6:54 Stephen Rothwell
2013-04-25 16:15 ` Kukjin Kim
2013-04-10  7:17 Stephen Rothwell
2013-04-10  8:36 ` Kukjin Kim
2013-04-11  8:37   ` Olof Johansson
2013-04-19 10:59     ` Kukjin Kim
2012-09-24  9:21 Stephen Rothwell
2012-09-24 17:02 ` Olof Johansson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130829175715.GH18542@quad.lixom.net \
    --to=olof@lixom.net \
    --cc=arnd@arndb.de \
    --cc=daniel.lezcano@linaro.org \
    --cc=keun-o.park@windriver.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=rafael.j.wysocki@intel.com \
    --cc=rjw@sisk.pl \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).