From: Linus Walleij <linus.walleij@linaro.org>
To: Gregory CLEMENT <gregory.clement@free-electrons.com>
Cc: "linux-gpio@vger.kernel.org" <linux-gpio@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
Rob Herring <robh+dt@kernel.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
Russell King <rmk+kernel@armlinux.org.uk>,
Nadav Haklai <nadavh@marvell.com>,
Kostya Porotchkin <kostap@marvell.com>,
Neta Zur Hershkovits <neta@marvell.com>,
Marcin Wojtas <mw@semihalf.com>, Omri Itach <omrii@marvell.com>,
Shadi Ammouri <shadi@marvell.com>
Subject: Re: [PATCH v2 01/11] pinctrl: dt-bindings: add documentation for AP806 pin controllers
Date: Sun, 11 Jun 2017 23:52:28 +0200 [thread overview]
Message-ID: <CACRpkdauBvun9COkL2Qox2k0vyOyWbRti=QmZPNE2DnwWCiJoQ@mail.gmail.com> (raw)
In-Reply-To: <878tl1pot6.fsf@free-electrons.com>
On Fri, Jun 9, 2017 at 10:07 AM, Gregory CLEMENT
<gregory.clement@free-electrons.com> wrote:
> As I wrote in the cover letter :
> "The patch modifying the documentation still depend on the ones of the
> clk series. For the ap806 a first stable branch is already available:
> https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/log/?h=clk-ap806"
Sorry I may miss things like that... usually it is better if patches
that depend on each other for merging are in the same series.
> In the previous version of the series the clk maintainer said they will
> provide stable branch for the documentation. For ap806 it is already
> done, but not yet for cp110. But if you still have problem with it Rob
> offer to take care of the devie tree documentation.
>
> Just let us know what you prefer.
I don't understand. Tell me what I need to do or we can just wait
a kernel cycle before merging this I guess.
Either I need an immutable branch or I merge the clock patches
I guess. Neither is very good but I'm open to compromises.
>> I hope for the love of god that this does not also clash with the
>> PWM stuff that is patching around in the GPIO tree, if it does
>> I might very well throw up my hands and defer merging all of
>> this until the next kernel cycle past v4.13-rc1.
>
> To avoid this kind of issues the series are based on next-20170531 in
> order to have in the same time the devel branch of the linux-gpio tree
> and the devel branch of the linux-pinctrl tree.
I see. Well if nothing else works, we just defer.
> I use the linux-next tree because you already picked up some patches of
> my first series and applied it on your devel branches. If I rebased on
> v4;12-rc2, obviously it won't work. So really basing the series on your
> devel branch is the best thing to do.
Indeed, sorry, the left hand doesn't know what the right hand is
doing sometimes.
> I saw that you already applied the PWM patch so as soon as they were
> visible on the devel branches I will rebased the series on it and submit
> it a new version.
OK
Yours,
Linus Walleij
next prev parent reply other threads:[~2017-06-11 21:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 14:23 [PATCH v2 00/11] Add support for the pin and gpio controllers on the Marvell Armada 7K/8K Gregory CLEMENT
2017-06-02 14:23 ` [PATCH v2 01/11] pinctrl: dt-bindings: add documentation for AP806 pin controllers Gregory CLEMENT
2017-06-09 7:50 ` Linus Walleij
2017-06-09 8:07 ` Gregory CLEMENT
2017-06-11 21:52 ` Linus Walleij [this message]
2017-06-02 14:23 ` [PATCH v2 02/11] pinctrl: dt-bindings: add documentation for CP110 " Gregory CLEMENT
2017-06-02 14:23 ` [PATCH v2 03/11] pinctrl: mvebu: remove the offset property for regmap Gregory CLEMENT
2017-06-02 14:23 ` [PATCH v2 04/11] pinctrl: avoid PLAT_ORION dependency Gregory CLEMENT
2017-06-02 14:23 ` [PATCH v2 05/11] arm64: marvell: enable the Armada 7K/8K pinctrl driver Gregory CLEMENT
2017-06-02 14:23 ` [PATCH v2 06/11] pinctrl: mvebu: add driver for Armada AP806 pinctrl Gregory CLEMENT
2017-06-02 14:23 ` [PATCH v2 07/11] pinctrl: mvebu: add driver for Armada CP110 pinctrl Gregory CLEMENT
2017-06-02 14:23 ` [PATCH v2 08/11] arm64: dts: marvell: add pinctrl support for Armada 7K/8K Gregory CLEMENT
2017-06-02 14:23 ` [PATCH v2 09/11] gpio: dt-bindings: Add documentation for gpio controllers on " Gregory CLEMENT
2017-06-08 14:18 ` Rob Herring
2017-06-02 14:23 ` [PATCH v2 10/11] gpio: mvebu: Add support for the Armada 7K/8K SoCs Gregory CLEMENT
2017-06-02 14:23 ` [PATCH v2 11/11] arm64: dts: marvell: add gpio support for Armada 7K/8K Gregory CLEMENT
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='CACRpkdauBvun9COkL2Qox2k0vyOyWbRti=QmZPNE2DnwWCiJoQ@mail.gmail.com' \
--to=linus.walleij@linaro.org \
--cc=andrew@lunn.ch \
--cc=devicetree@vger.kernel.org \
--cc=gregory.clement@free-electrons.com \
--cc=jason@lakedaemon.net \
--cc=kostap@marvell.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mw@semihalf.com \
--cc=nadavh@marvell.com \
--cc=neta@marvell.com \
--cc=omrii@marvell.com \
--cc=rmk+kernel@armlinux.org.uk \
--cc=robh+dt@kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=shadi@marvell.com \
--cc=thomas.petazzoni@free-electrons.com \
/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).