From: Olof Johansson <olof@lixom.net>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: arm@kernel.org, 'Arnd Bergmann' <arnd@arndb.de>,
'Kevin Hilman' <khilman@linaro.org>,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org,
'Daniel Lezcano' <daniel.lezcano@linaro.org>
Subject: Re: [GIT PULL 3rd 1/3] Samsung Exynos cpuidle updates for 3.16
Date: Thu, 29 May 2014 12:38:41 -0700 [thread overview]
Message-ID: <20140529193841.GF18481@quad.lixom.net> (raw)
In-Reply-To: <035601cf7897$6c959190$45c0b4b0$@samsung.com>
On Mon, May 26, 2014 at 01:03:17PM +0900, Kukjin Kim wrote:
> Note: merge conflict will be happened when pulling this for
> arch/arm/mach-exynos/cpuidle.
> You may just fixup with 'git rm arch/arm/mach-exynos/cpuidle.', it is due to
> 'removing inclusion of <plat/cpu.h>' before moving cpuidle driver into
> drivers/cpuidle...
>
> - Kukjin
>
> The following changes since commit 985326c9f65a4c1a3b5ab875e6ce0c97c39449ec:
>
> Merge branch 'v3.16-next/clk-samsung' into v3.16-next/cpuidle-exynos
> (2014-05-26 05:20:25 +0900)
>
> are available in the git repository at:
>
>
> http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> tags/exynos-cpuidle
>
> for you to fetch changes up to cd245f59aae5d6ef265f46aa6cea78354d61b629:
>
> ARM: EXYNOS: Fix kernel panic when unplugging CPU1 on exynos (2014-05-26
> 05:21:47 +0900)
>
> ----------------------------------------------------------------
> Samsung exynos-cpuidle updates for v3.16
>
> - From Daniel Lezcano:
> This patchset relies on the cpm_pm notifier to initiate the
> powerdown sequence operations from pm.c instead cpuidle.c.
> Thus the cpuidle driver is no longer dependent from arch
> specific code as everything is called from the pm.c file.
>
> Note, this is based on tags/exnos-mcpm and tags/samsung-clk
Merged into next/drivers. Thanks.
-Olof
prev parent reply other threads:[~2014-05-29 19:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-26 4:03 [GIT PULL 3rd 1/3] Samsung Exynos cpuidle updates for 3.16 Kukjin Kim
2014-05-29 18:21 ` Olof Johansson
2014-05-29 19:38 ` Olof Johansson [this message]
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=20140529193841.GF18481@quad.lixom.net \
--to=olof@lixom.net \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=daniel.lezcano@linaro.org \
--cc=kgene.kim@samsung.com \
--cc=khilman@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
/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