From: Shawn Guo <shawnguo@kernel.org>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Lina Iyer <lina.iyer@linaro.org>,
Shawn Guo <shawn.guo@linaro.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Fabio Estevam <fabio.estevam@nxp.com>
Subject: Re: linux-next: manual merge of the pm tree with the imx-mxs tree
Date: Tue, 25 Oct 2016 07:55:58 +0800 [thread overview]
Message-ID: <20161024235558.GN30578@tiger> (raw)
In-Reply-To: <8126928.lSNgbyj5lv@vostro.rjw.lan>
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
next prev parent reply other threads:[~2016-10-24 23:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-24 23:47 linux-next: manual merge of the pm tree with the imx-mxs tree Stephen Rothwell
2016-10-24 23:58 ` Rafael J. Wysocki
2016-10-24 23:55 ` Shawn Guo [this message]
2016-10-25 3:32 ` Lina Iyer
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=20161024235558.GN30578@tiger \
--to=shawnguo@kernel.org \
--cc=fabio.estevam@nxp.com \
--cc=lina.iyer@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
--cc=shawn.guo@linaro.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