linux-kernel - Re: [PATCH v4 1/5] dt-bindings: w1: document generic onewire bindings

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <5070717c-4c9f-c580-8f50-2369dcd74aef@zonque.org>
Date:   Wed, 18 Jul 2018 14:40:16 +0200
From:   Daniel Mack <daniel@...que.org>
To:     Rob Herring <robh@...nel.org>
Cc:     zbr@...emap.net, mark.rutland@....com, szabolcs.gyurko@....hu,
        sre@...nel.org, devicetree@...r.kernel.org,
        linux-kernel@...r.kernel.org, linux-pm@...r.kernel.org,
        robert.jarzmik@...e.fr
Subject: Re: [PATCH v4 1/5] dt-bindings: w1: document generic onewire bindings

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@...que.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@...nel.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?


Thanks everyone!
Daniel