* [GIT PULL] imx6q cpuidle for 3.9
@ 2013-01-29 5:46 Shawn Guo
2013-01-29 17:50 ` Olof Johansson
0 siblings, 1 reply; 5+ messages in thread
From: Shawn Guo @ 2013-01-29 5:46 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565:
Linux 3.8-rc1 (2012-12-21 17:19:00 -0800)
are available in the git repository at:
git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx6q-cpudile-3.9
for you to fetch changes up to e510aafde64a3fdd741f598e4d2be3c079bf5b0e:
ARM: imx6q: support WAIT mode using cpuidle (2013-01-29 13:41:42 +0800)
----------------------------------------------------------------
It's imx6q cpuidle series for 3.9.
----------------------------------------------------------------
Shawn Guo (4):
ARM: imx: return zero in case next event gets a large increment
ARM: imx: mask gpc interrupts initially
ARM: imx: move imx6q_cpuidle_driver into a separate file
ARM: imx6q: support WAIT mode using cpuidle
arch/arm/mach-imx/Makefile | 6 ++-
arch/arm/mach-imx/clk-imx6q.c | 12 +++++
arch/arm/mach-imx/common.h | 3 ++
arch/arm/mach-imx/cpuidle-imx6q.c | 95 +++++++++++++++++++++++++++++++++++++
arch/arm/mach-imx/cpuidle.h | 5 ++
arch/arm/mach-imx/gpc.c | 5 ++
arch/arm/mach-imx/mach-imx6q.c | 17 +++----
arch/arm/mach-imx/platsmp.c | 10 ++++
arch/arm/mach-imx/time.c | 3 +-
9 files changed, 143 insertions(+), 13 deletions(-)
create mode 100644 arch/arm/mach-imx/cpuidle-imx6q.c
^ permalink raw reply [flat|nested] 5+ messages in thread* [GIT PULL] imx6q cpuidle for 3.9
2013-01-29 5:46 [GIT PULL] imx6q cpuidle for 3.9 Shawn Guo
@ 2013-01-29 17:50 ` Olof Johansson
2013-01-30 13:19 ` Shawn Guo
0 siblings, 1 reply; 5+ messages in thread
From: Olof Johansson @ 2013-01-29 17:50 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 29, 2013 at 01:46:37PM +0800, Shawn Guo wrote:
> The following changes since commit a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565:
>
> Linux 3.8-rc1 (2012-12-21 17:19:00 -0800)
>
> are available in the git repository at:
>
> git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx6q-cpudile-3.9
>
> for you to fetch changes up to e510aafde64a3fdd741f598e4d2be3c079bf5b0e:
>
> ARM: imx6q: support WAIT mode using cpuidle (2013-01-29 13:41:42 +0800)
>
> ----------------------------------------------------------------
> It's imx6q cpuidle series for 3.9.
>
> ----------------------------------------------------------------
> Shawn Guo (4):
> ARM: imx: return zero in case next event gets a large increment
> ARM: imx: mask gpc interrupts initially
> ARM: imx: move imx6q_cpuidle_driver into a separate file
> ARM: imx6q: support WAIT mode using cpuidle
This has some small conflicts with the cleanup branch. Can you please base it
on top of cleanup so we can avoid the merge conflicts when things go upstream?
It's common to have the per-soc cleanup branches as bases for some of the
feature branches just for this reason.
Thanks!
-Olof
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] imx6q cpuidle for 3.9
2013-01-29 17:50 ` Olof Johansson
@ 2013-01-30 13:19 ` Shawn Guo
2013-02-05 2:03 ` Shawn Guo
0 siblings, 1 reply; 5+ messages in thread
From: Shawn Guo @ 2013-01-30 13:19 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 29, 2013 at 09:50:28AM -0800, Olof Johansson wrote:
> This has some small conflicts with the cleanup branch. Can you please base it
> on top of cleanup so we can avoid the merge conflicts when things go upstream?
> It's common to have the per-soc cleanup branches as bases for some of the
> feature branches just for this reason.
>
Ok, done as below.
The following changes since commit 1d7180e24e22a608cc4d7e8fd425a19a9394a7ed:
Merge tag 'imx-cleanup-3.9' into imx6q-cpuidle (2013-01-30 21:07:14 +0800)
are available in the git repository at:
git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx6q-cpudile-3.9
for you to fetch changes up to e5f9dec8ff5ff3f6254412abed1f68d758f6616b:
ARM: imx6q: support WAIT mode using cpuidle (2013-01-30 21:09:31 +0800)
----------------------------------------------------------------
imx6q cpuidle support for 3.9
- It's based on imx-cleanup-3.9 to avoid conflicts.
----------------------------------------------------------------
Shawn Guo (4):
ARM: imx: return zero in case next event gets a large increment
ARM: imx: mask gpc interrupts initially
ARM: imx: move imx6q_cpuidle_driver into a separate file
ARM: imx6q: support WAIT mode using cpuidle
arch/arm/mach-imx/Makefile | 6 ++-
arch/arm/mach-imx/clk-imx6q.c | 12 +++++
arch/arm/mach-imx/common.h | 3 ++
arch/arm/mach-imx/cpuidle-imx6q.c | 95 +++++++++++++++++++++++++++++++++++++
arch/arm/mach-imx/cpuidle.h | 5 ++
arch/arm/mach-imx/gpc.c | 5 ++
arch/arm/mach-imx/mach-imx6q.c | 17 +++----
arch/arm/mach-imx/platsmp.c | 10 ++++
arch/arm/mach-imx/time.c | 3 +-
9 files changed, 143 insertions(+), 13 deletions(-)
create mode 100644 arch/arm/mach-imx/cpuidle-imx6q.c
^ permalink raw reply [flat|nested] 5+ messages in thread* [GIT PULL] imx6q cpuidle for 3.9
2013-01-30 13:19 ` Shawn Guo
@ 2013-02-05 2:03 ` Shawn Guo
2013-02-05 6:25 ` Olof Johansson
0 siblings, 1 reply; 5+ messages in thread
From: Shawn Guo @ 2013-02-05 2:03 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jan 30, 2013 at 09:19:22PM +0800, Shawn Guo wrote:
> On Tue, Jan 29, 2013 at 09:50:28AM -0800, Olof Johansson wrote:
> > This has some small conflicts with the cleanup branch. Can you please base it
> > on top of cleanup so we can avoid the merge conflicts when things go upstream?
> > It's common to have the per-soc cleanup branches as bases for some of the
> > feature branches just for this reason.
> >
> Ok, done as below.
>
Ping?
Shawn
> The following changes since commit 1d7180e24e22a608cc4d7e8fd425a19a9394a7ed:
>
> Merge tag 'imx-cleanup-3.9' into imx6q-cpuidle (2013-01-30 21:07:14 +0800)
>
> are available in the git repository at:
>
>
> git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx6q-cpudile-3.9
>
> for you to fetch changes up to e5f9dec8ff5ff3f6254412abed1f68d758f6616b:
>
> ARM: imx6q: support WAIT mode using cpuidle (2013-01-30 21:09:31 +0800)
>
> ----------------------------------------------------------------
> imx6q cpuidle support for 3.9
>
> - It's based on imx-cleanup-3.9 to avoid conflicts.
>
> ----------------------------------------------------------------
> Shawn Guo (4):
> ARM: imx: return zero in case next event gets a large increment
> ARM: imx: mask gpc interrupts initially
> ARM: imx: move imx6q_cpuidle_driver into a separate file
> ARM: imx6q: support WAIT mode using cpuidle
>
> arch/arm/mach-imx/Makefile | 6 ++-
> arch/arm/mach-imx/clk-imx6q.c | 12 +++++
> arch/arm/mach-imx/common.h | 3 ++
> arch/arm/mach-imx/cpuidle-imx6q.c | 95 +++++++++++++++++++++++++++++++++++++
> arch/arm/mach-imx/cpuidle.h | 5 ++
> arch/arm/mach-imx/gpc.c | 5 ++
> arch/arm/mach-imx/mach-imx6q.c | 17 +++----
> arch/arm/mach-imx/platsmp.c | 10 ++++
> arch/arm/mach-imx/time.c | 3 +-
> 9 files changed, 143 insertions(+), 13 deletions(-)
> create mode 100644 arch/arm/mach-imx/cpuidle-imx6q.c
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] imx6q cpuidle for 3.9
2013-02-05 2:03 ` Shawn Guo
@ 2013-02-05 6:25 ` Olof Johansson
0 siblings, 0 replies; 5+ messages in thread
From: Olof Johansson @ 2013-02-05 6:25 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Feb 05, 2013 at 10:03:47AM +0800, Shawn Guo wrote:
> On Wed, Jan 30, 2013 at 09:19:22PM +0800, Shawn Guo wrote:
> > On Tue, Jan 29, 2013 at 09:50:28AM -0800, Olof Johansson wrote:
> > > This has some small conflicts with the cleanup branch. Can you please base it
> > > on top of cleanup so we can avoid the merge conflicts when things go upstream?
> > > It's common to have the per-soc cleanup branches as bases for some of the
> > > feature branches just for this reason.
> > >
> > Ok, done as below.
> >
> Ping?
Yeah, sorry -- pulled now as imx/cpuidle, included in next/soc.
-Olof
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-02-05 6:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-29 5:46 [GIT PULL] imx6q cpuidle for 3.9 Shawn Guo
2013-01-29 17:50 ` Olof Johansson
2013-01-30 13:19 ` Shawn Guo
2013-02-05 2:03 ` Shawn Guo
2013-02-05 6:25 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox