From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from kirsty.vergenet.net ([202.4.237.240]:43630 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753993AbdC2IJQ (ORCPT ); Wed, 29 Mar 2017 04:09:16 -0400 Date: Wed, 29 Mar 2017 10:09:09 +0200 From: Simon Horman To: Chris Brandt Cc: Geert Uytterhoeven , Magnus Damm , Rob Herring , Mark Rutland , "devicetree@vger.kernel.org" , Linux-Renesas Subject: Re: [PATCH] ARM: dts: r7s72100: add power-domains to sdhi Message-ID: <20170329080909.GE6512@verge.net.au> References: <20170209133803.21539-1-chris.brandt@renesas.com> <20170324070228.GI1319@verge.net.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-renesas-soc-owner@vger.kernel.org List-ID: On Fri, Mar 24, 2017 at 11:17:25AM +0000, Chris Brandt wrote: > On Friday, March 24, 2017, Geert Uytterhoeven wrote: > > > The fixes tag above indicates this is a fix for v4.10, however, when I > > > tried to apply it on top of v4.11-rc1 there was a conflict. So I > > > think a backport will be required if we want it to be considered for > > > v4.11 and be considered for and in turn v4.10-stable. > > > > That's because of commit 3d2abda02ad2d06d > > ("ARM: dts: r7s72100: update sdhi clock bindings") > > > Between the two, "update sdhi clock bindings" is more important this this patch ("add power-domains"). > Without "update sdhi clock bindings", the SDHI /might/ not work. > > > But, "update sdhi clock bindings", also relies on the driver update 34a1654706c6 ("mmc: sh_mobile_sdhi: add support for 2 clocks"). > That one is in v4.11-rc1, but not in 4.10.5. > > I just noticed now that 34a1654706c6 does not have "Fixes" in the commit log, so it is probably not marked to go into v4.10-stable, so in that case backporting the dtsi is pointless. We could try to coordinate getting 34a1654706c6 and the dtsi changes into v4.10-stable if you it is sufficiently important. What are your thoughts on that?