Hi, On Fri, Jul 20, 2018 at 09:10:36AM -0600, Rob Herring wrote: > On Wed, Jul 18, 2018 at 6:40 AM Daniel Mack <daniel@xxxxxxxxxx> 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@xxxxxxxxxx> > > >> --- > > >> .../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@xxxxxxxxxx> > > > > > > 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. This looks simple enough to just add a note to my pull request. I prepared a immutable branch based on 4.18-rc1, which contains this series and merged it into the power supply subsystem. You can get it here: https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git/tag/?h=ds2760-for-v4.19-signed -- Sebastian
Attachment:
signature.asc
Description: PGP signature
