From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-renesas-soc-owner@vger.kernel.org>
Received: from kirsty.vergenet.net ([202.4.237.240]:37004 "EHLO
        kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751141AbdFOSwg (ORCPT
        <rfc822;linux-renesas-soc@vger.kernel.org>);
        Thu, 15 Jun 2017 14:52:36 -0400
Date: Thu, 15 Jun 2017 20:52:31 +0200
From: Simon Horman <horms@verge.net.au>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>,
        "kbuild-all@01.org" <kbuild-all@01.org>,
        Linux-Renesas <linux-renesas-soc@vger.kernel.org>,
        Ulf Hansson <ulf.hansson@linaro.org>,
        kbuild test robot <fengguang.wu@intel.com>
Subject: Re: [renesas:drivers-for-v4.13 3/3]
 drivers/soc/renesas/rcar-sysc.c:209:19: error: 'GENPD_FLAG_ALWAYS_ON'
 undeclared
Message-ID: <20170615185226.GA9808@verge.net.au>
References: <201706141946.RByoFGXO%fengguang.wu@intel.com>
 <CAMuHMdUkhpGGJPNLKmWn1znNcLFL7e7nqp6QK59qCd0Y8i22-w@mail.gmail.com>
 <20170615134541.GA22158@verge.net.au>
 <CAMuHMdUmkU-e2wWAYgKZ48u8HYE1VO7jSP0NRAqJafAzdZbwPA@mail.gmail.com>
 <20170615142040.GC22158@verge.net.au>
 <CAMuHMdXU-VPi-kVPjSXT2VdAc53DkGzqbWerUjparSyH+B10fQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAMuHMdXU-VPi-kVPjSXT2VdAc53DkGzqbWerUjparSyH+B10fQ@mail.gmail.com>
Sender: linux-renesas-soc-owner@vger.kernel.org
List-ID: <linux-renesas-soc.vger.kernel.org>

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@verge.net.au> 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@verge.net.au> 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.