Patchwork [GIT,PULL,1/5] omap pm fixes for v3.10 merge window

login
register
mail settings
Submitter Tony Lindgren
Date April 9, 2013, 4:51 a.m.
Message ID <pull-1365483063-475562>
Download mbox
Permalink /patch/234953/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/fixes-pm-signed

Comments

Tony Lindgren - April 9, 2013, 4:51 a.m.
The following changes since commit c309f7f46167e85d1aae2fd31f23e7d2b5cdfbe0:

  Merge branch 'for_3.10/omap_generic_cleanup_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux into omap-for-v3.10/cleanup-v2 (2013-03-28 14:45:31 -0700)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/fixes-pm-signed

for you to fetch changes up to 5e7deed71290136cf70944e158f40401d0eed784:

  Merge tag 'omap-pm-v3.10/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.10/fixes-pm (2013-04-08 09:58:00 -0700)

----------------------------------------------------------------

Non-critical PM fix via Kevin Hilman <khilman@linaro.org>:

OMAP PM fixes for v3.10

Note that this has a dependency to omap-for-v3.10/cleanup-v2-signed.

----------------------------------------------------------------
Santosh Shilimkar (1):
      ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method

Tony Lindgren (1):
      Merge tag 'omap-pm-v3.10/fixes/pm' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.10/fixes-pm

 arch/arm/mach-omap2/cpuidle44xx.c |  1 +
 arch/arm/mach-omap2/omap-smp.c    | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)
Arnd Bergmann - April 9, 2013, 1:43 p.m.
On Tuesday 09 April 2013, Tony Lindgren wrote:
> The following changes since commit c309f7f46167e85d1aae2fd31f23e7d2b5cdfbe0:
> 
>   Merge branch 'for_3.10/omap_generic_cleanup_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux into omap-for-v3.10/cleanup-v2 (2013-03-28 14:45:31 -0700)
> 

Pulled into next/cleanup branch because of the dependency. Thanks,

	Arnd
Olof Johansson - April 11, 2013, 11:06 a.m.
Hi,

On Mon, Apr 08, 2013 at 09:51:03PM -0700, Tony Lindgren wrote:
> The following changes since commit 5852264f9d6139751796853fdfca9d5230cbfb97:
> 
>   Merge tag 'omap-devel-b-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into for_3.10/dts_merged (2013-04-09 00:11:05 +0200)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/dt-signed-v2
> 
> for you to fetch changes up to 161e89a689bb88004b757986eefda2402448eef7:
> 
>   ARM/dts: OMAP3: fix pinctrl-single configuration (2013-04-08 17:00:22 -0700)
> 
> ----------------------------------------------------------------
> Device tree updates for omaps via Benoit Cousson <b-cousson@ti.com>.
> 
> Note that the branch has dependencies to two other branches:
> 
> - omap-devel-b-for-3.10 from Paul to get the AM33xx missing
>   hwmod and thus avoid a regression with Santosh's hwmod
>   cleanup including in this DT series [1]. It avoids breaking
>   bisect if this series is merged before Paul's fixes.

Looks like this was part of omap/fixes-non-critical, the branch name from Paul
just didn't percolate up. At least the topmost SHA from that merge in your
history seems to be part of said branch. :)


> - omap-for-v3.10/usb branch to avoid nasty merge conflict in
>   omap3.dtsi and omap4.dtsi due to the DTS patches contained
>   in the USB branch because of a screw up by the unnamed person
>   typing this signed tag based on Benoit's comments.


Ok, it looks like this one was merged in next/drivers as omap/usb.


So based on the above, I've merged in omap/fixes-non-critical and omap/usb as
a base, and merged this on top. All of this has gone into next/dt2.

-Olof
Tony Lindgren - April 11, 2013, 4:34 p.m.
* Olof Johansson <olof@lixom.net> [130411 04:11]:
> Hi,
> 
> On Mon, Apr 08, 2013 at 09:51:03PM -0700, Tony Lindgren wrote:
> > The following changes since commit 5852264f9d6139751796853fdfca9d5230cbfb97:
> > 
> >   Merge tag 'omap-devel-b-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into for_3.10/dts_merged (2013-04-09 00:11:05 +0200)
> > 
> > are available in the git repository at:
> > 
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/dt-signed-v2
> > 
> > for you to fetch changes up to 161e89a689bb88004b757986eefda2402448eef7:
> > 
> >   ARM/dts: OMAP3: fix pinctrl-single configuration (2013-04-08 17:00:22 -0700)
> > 
> > ----------------------------------------------------------------
> > Device tree updates for omaps via Benoit Cousson <b-cousson@ti.com>.
> > 
> > Note that the branch has dependencies to two other branches:
> > 
> > - omap-devel-b-for-3.10 from Paul to get the AM33xx missing
> >   hwmod and thus avoid a regression with Santosh's hwmod
> >   cleanup including in this DT series [1]. It avoids breaking
> >   bisect if this series is merged before Paul's fixes.
> 
> Looks like this was part of omap/fixes-non-critical, the branch name from Paul
> just didn't percolate up. At least the topmost SHA from that merge in your
> history seems to be part of said branch. :)
> 
> 
> > - omap-for-v3.10/usb branch to avoid nasty merge conflict in
> >   omap3.dtsi and omap4.dtsi due to the DTS patches contained
> >   in the USB branch because of a screw up by the unnamed person
> >   typing this signed tag based on Benoit's comments.
> 
> 
> Ok, it looks like this one was merged in next/drivers as omap/usb.
> 
> 
> So based on the above, I've merged in omap/fixes-non-critical and omap/usb as
> a base, and merged this on top. All of this has gone into next/dt2.

OK thanks.

Tony