From: Simon Horman <horms@verge.net.au>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Stephen Boyd <sboyd@codeaurora.org>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Michael Turquette <mturquette@baylibre.com>,
linux-clk <linux-clk@vger.kernel.org>,
Linux-Renesas <linux-renesas-soc@vger.kernel.org>
Subject: Re: [git pull] clk: renesas: Updates for v4.10 (take two)
Date: Fri, 18 Nov 2016 10:59:40 +0100 [thread overview]
Message-ID: <20161118095938.GC22664@verge.net.au> (raw)
In-Reply-To: <CAMuHMdU9TRVWyCFf=auH2qZdW0hDYJW-E2ukruNY8dkn9yarxA@mail.gmail.com>
On Fri, Nov 18, 2016 at 10:55:00AM +0100, Geert Uytterhoeven wrote:
> Hi Stephen, Simon,
>
> On Fri, Nov 18, 2016 at 12:07 AM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> > On 11/07, Geert Uytterhoeven wrote:
> >> The following changes since commit dbdcc4f996df280eb2758095b4774ea62da8a2a7:
> >>
> >> clk: renesas: r8a7796: Add DU and LVDS clocks (2016-11-02 20:40:08 +0100)
> >>
> >> are available in the git repository at:
> >>
> >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git tags/clk-renesas-for-v4.10-tag2
> >>
> >> for you to fetch changes up to 1936be95e013802291201c1ed193e04fd1ed3d13:
> >
> > Ok. Pulled into clk-next. I'm a little wary here as I haven't
> > seen any indication from arm-soc maintainers (not Simon) that
> > they'll take this cross tree merge. I guess we'll see how it
> > goes.
>
> Thanks for pulling!
>
> Simon: while it's too late in the v4.10 cycle to queue additional cleanups in
> the platform code on top of this, can you please still pull
>
> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
> rcar-rst
>
> to resolve the (trivial) merge conflicts between the conversion to the RST
> driver in that branch, and the addition of PRR and RZ/G support in your tree?
> This will prevent arm-soc and/or Linus from having to deal with these
> conflicts.
>
> For reference, I've pushed the conflict resolution to branch
Pull where? I've already sent pull-requests to the ARM SoC maintainers
so I fear this may be too late.
next prev parent reply other threads:[~2016-11-18 9:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-07 15:35 [git pull] clk: renesas: Updates for v4.10 (take two) Geert Uytterhoeven
2016-11-17 23:07 ` Stephen Boyd
2016-11-18 9:55 ` Geert Uytterhoeven
2016-11-18 9:59 ` Simon Horman [this message]
2016-11-18 10:12 ` Geert Uytterhoeven
2016-11-18 10:44 ` Geert Uytterhoeven
2016-11-18 17:49 ` Olof Johansson
2016-11-21 9:08 ` Geert Uytterhoeven
2016-11-18 9:55 ` Simon Horman
2016-11-18 9:58 ` 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=20161118095938.GC22664@verge.net.au \
--to=horms@verge.net.au \
--cc=geert+renesas@glider.be \
--cc=geert@linux-m68k.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@codeaurora.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).