Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1507835

Re: linux-next: manual merge of the pm tree with the imx-mxs tree

Show all headers | View raw

On Tue, Oct 25, 2016 at 01:58:25AM +0200, Rafael J. Wysocki wrote:
> On Tuesday, October 25, 2016 10:47:29 AM Stephen Rothwell wrote:
> > Hi Rafael,
> > 
> > Today's linux-next merge of the pm tree got a conflict in:
> > 
> >   arch/arm/mach-imx/gpc.c
> > 
> > between commits:
> > 
> >   eef0b282bb58 ("ARM: imx: gpc: Initialize all power domains")
> >   f9d1f7a7ad91 ("ARM: imx: gpc: Fix the imx_gpc_genpd_init() error path")
> > 
> > from the imx-mxs tree and commit:
> > 
> >   59d65b73a23c ("PM / Domains: Make genpd state allocation dynamic")
> > 
> > from the pm tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary.
> 
> Thanks Stephen!
> 
> Lina, please have a look at the Stephen's fix and let me know if that
> conflict should be resolved in a different way.

FYI. We target the following two fixes 4.9-rc.

eef0b282bb58 ("ARM: imx: gpc: Initialize all power domains")
f9d1f7a7ad91 ("ARM: imx: gpc: Fix the imx_gpc_genpd_init() error path")

Shawn

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the pm tree with the imx-mxs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-10-25 01:50 +0200
  Re: linux-next: manual merge of the pm tree with the imx-mxs tree Shawn Guo <shawnguo@kernel.org> - 2016-10-25 02:00 +0200
  Re: linux-next: manual merge of the pm tree with the imx-mxs tree "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-10-25 02:00 +0200
    Re: linux-next: manual merge of the pm tree with the imx-mxs tree Lina Iyer <lina.iyer@linaro.org> - 2016-10-25 05:40 +0200

csiph-web