From: Simon Horman <horms@verge.net.au>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Chris Brandt <chris.brandt@renesas.com>,
Magnus Damm <magnus.damm@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
Linux-Renesas <linux-renesas-soc@vger.kernel.org>
Subject: Re: [PATCH] ARM: dts: r7s72100: add power-domains to sdhi
Date: Fri, 24 Mar 2017 10:40:55 +0100 [thread overview]
Message-ID: <20170324094054.GA7422@verge.net.au> (raw)
In-Reply-To: <CAMuHMdUJMEjb8UhaHHK3aE2uEoUpKFtSFXLhYwgJHKu9YDeVHQ@mail.gmail.com>
On Fri, Mar 24, 2017 at 08:55:44AM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
>
> On Fri, Mar 24, 2017 at 8:02 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Wed, Mar 22, 2017 at 02:25:04PM +0100, Geert Uytterhoeven wrote:
> >> (this time reply-to-all)
> >>
> >> On Thu, Feb 9, 2017 at 2:38 PM, Chris Brandt <chris.brandt@renesas.com> wrote:
> >> > Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
> >> > Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
> >> > Fixes: 66474697923c ("ARM: dts: r7s72100: add sdhi to device tree")
> >>
> >> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
> >
> > Thanks, I have queued this up for v4.12.
> >
> > 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")
>
> > This makes things a bit messy with regards to conflicts between v4.11 and
> > v4.12 and I'm inclined to pass on the backport.
>
> If you ever want to backport, you'll have two backport changes too the
> SDHI driver, too.
Is that the case if only this patch (and not 3d2abda02ad2d06d) is backported?
next prev parent reply other threads:[~2017-03-24 9:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-09 13:38 [PATCH] ARM: dts: r7s72100: add power-domains to sdhi Chris Brandt
2017-03-22 13:25 ` Geert Uytterhoeven
[not found] ` <CAMuHMdXRD3o7KdaADvPYxzeuEVo44nRVWHfCverPc+9s=0owPA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-03-24 7:02 ` Simon Horman
2017-03-24 7:55 ` Geert Uytterhoeven
2017-03-24 9:40 ` Simon Horman [this message]
2017-03-24 9:45 ` Geert Uytterhoeven
[not found] ` <CAMuHMdUJMEjb8UhaHHK3aE2uEoUpKFtSFXLhYwgJHKu9YDeVHQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-03-24 11:17 ` Chris Brandt
2017-03-29 8:09 ` Simon Horman
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=20170324094054.GA7422@verge.net.au \
--to=horms@verge.net.au \
--cc=chris.brandt@renesas.com \
--cc=devicetree@vger.kernel.org \
--cc=geert@linux-m68k.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.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;
as well as URLs for NNTP newsgroup(s).