On Thu, Jun 15, 2017 at 08:52:31PM +0200, Simon Horman wrote:
> On Thu, Jun 15, 2017 at 04:31:48PM +0200, Geert Uytterhoeven wrote:
> > Hi Simon,
> >
> > On Thu, Jun 15, 2017 at 4:20 PM, Simon Horman <horms@xxxxxxxxxxxx> wrote:
> > > On Thu, Jun 15, 2017 at 04:08:56PM +0200, Geert Uytterhoeven wrote:
> > >> On Thu, Jun 15, 2017 at 3:45 PM, Simon Horman <horms@xxxxxxxxxxxx> wrote:
> > >> depends on commit ffaa42e8a40b7f10 ("PM / Domains: Enable users of genpd
> > >> to specify always on PM domains") in v4.12-rc1.
> > >>
> > >> It does not depend on anything else that's only in fixes-for-v4.12.
> > >
> > > Ok, that is clear. But for some reason I thought that
> > >
> > > "soc: renesas: Rework Kconfig and Makefile logic" depends on
> > > "soc: renesas: Provide dummy rcar_rst_read_mode_pins() for compile-testing"
> >
> > Yes, it does, as the former reworks the dummy provided by the latter.
> >
> > But "soc: renesas: rcar-sysc: Use GENPD_FLAG_ALWAYS_ON" does not depend
> > on any of these.
> >
> > But now I understand the issue you're facing: drivers-for-v4.13 depends both on
> > commits in v4.12-rc1, and on fixes still destined for v4.12.
>
> Yes, that is the one.
>
> I think the simplest solution is to base drivers-for-v4.13 on a merge of
> v4.12-rc1 and fixes-for-v4.13.
For now I have gone with separate branches, this seems to be yet simpler.
