From: Rob Herring <robh@kernel.org>
To: Daniel Mack <daniel@zonque.org>
Cc: zbr@ioremap.net, Mark Rutland <mark.rutland@arm.com>,
szabolcs.gyurko@tlt.hu, Sebastian Reichel <sre@kernel.org>,
devicetree@vger.kernel.org,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"open list:THERMAL" <linux-pm@vger.kernel.org>,
Robert Jarzmik <robert.jarzmik@free.fr>
Subject: Re: [PATCH v4 1/5] dt-bindings: w1: document generic onewire bindings
Date: Fri, 20 Jul 2018 09:10:36 -0600 [thread overview]
Message-ID: <CAL_JsqL10WT5AK37_8o3M_=UiLx_thcm1W3UNz2qBaB5dRo8XA@mail.gmail.com> (raw)
In-Reply-To: <5070717c-4c9f-c580-8f50-2369dcd74aef@zonque.org>
On Wed, Jul 18, 2018 at 6:40 AM Daniel Mack <daniel@zonque.org> wrote:
>
> On Wednesday, July 11, 2018 05:01 PM, Rob Herring wrote:
> > On Fri, Jul 06, 2018 at 07:35:48AM +0200, Daniel Mack wrote:
> >> This patch adds a generic w1 bindings document that describes how w1
> >> slave deviceses are grouped under master nodes. It also augments the
> >> existing w1-gpio.txt document a bit.
> >>
> >> Signed-off-by: Daniel Mack <daniel@zonque.org>
> >> ---
> >> .../devicetree/bindings/w1/w1-gpio.txt | 11 +++++---
> >> Documentation/devicetree/bindings/w1/w1.txt | 25 +++++++++++++++++++
> >> 2 files changed, 33 insertions(+), 3 deletions(-)
> >> create mode 100644 Documentation/devicetree/bindings/w1/w1.txt
> >
> > Reviewed-by: Rob Herring <robh@kernel.org>
> >
> > Note that this will conflict with a unit-address fix that I have queued
> > up for 4.18 (will send this week).
>
> How would we best handle this? Sebastian, are you going to apply this
> series, and add a note to the PR for 4.19 on how to resolve the conflict?
Either 4.18-rc6 or my devicetree-fixes-for-4.18 tag (based on rc1) can
be pulled in. Or just note the conflict. It is trivial enough.
Rob
next prev parent reply other threads:[~2018-07-20 15:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-06 5:35 [PATCH v4 0/5] Add devicetree functionality to w1 busses and ds2760 Daniel Mack
2018-07-06 5:35 ` [PATCH v4 1/5] dt-bindings: w1: document generic onewire bindings Daniel Mack
2018-07-11 15:01 ` Rob Herring
2018-07-18 12:40 ` Daniel Mack
2018-07-20 15:10 ` Rob Herring [this message]
2018-07-22 22:01 ` Sebastian Reichel
2018-07-06 5:35 ` [PATCH v4 2/5] dt-bindings: w1: document bindings for ds2760 battery monitor Daniel Mack
2018-07-11 15:02 ` Rob Herring
2018-07-06 5:35 ` [PATCH v4 3/5] w1: core: match sub-nodes of bus masters in devicetree Daniel Mack
2018-07-06 13:52 ` Sebastian Reichel
2018-07-06 14:51 ` Greg Kroah-Hartman
2018-07-06 5:35 ` [PATCH v4 4/5] power: supply: ds2760_battery: merge ds2760 supply driver with its w1 slave companion Daniel Mack
2018-07-06 13:36 ` Sebastian Reichel
2018-07-06 5:35 ` [PATCH v4 5/5] power: supply: ds2760_battery: add devicetree probing Daniel Mack
2018-07-06 13:43 ` Sebastian Reichel
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='CAL_JsqL10WT5AK37_8o3M_=UiLx_thcm1W3UNz2qBaB5dRo8XA@mail.gmail.com' \
--to=robh@kernel.org \
--cc=daniel@zonque.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robert.jarzmik@free.fr \
--cc=sre@kernel.org \
--cc=szabolcs.gyurko@tlt.hu \
--cc=zbr@ioremap.net \
/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).