Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 6 Dec 2022 12:13:55 -0600
From:   Bjorn Andersson <andersson@kernel.org>
To:     Rob Herring <robh+dt@kernel.org>
Cc:     Jonathan Cameron <Jonathan.Cameron@huawei.com>,
        Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
        Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
        Jonathan Cameron <jic23@kernel.org>,
        Lars-Peter Clausen <lars@metafoo.de>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Andy Gross <agross@kernel.org>, linux-iio@vger.kernel.org,
        devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] dt-bindings: iio: adc: qcom,spmi-vadc: fix PM8350 define
Message-ID: <20221206181355.qhbchi2d2gvaroln@builder.lan>
References: <20221117121307.264550-1-krzysztof.kozlowski@linaro.org>
 <20221117122256.GG93179@thinkpad>
 <a3da2ab9-ad36-2283-0659-ad8ebf877e17@linaro.org>
 <20221117155658.00005d08@Huawei.com>
 <9ddf7e56-f396-5720-9960-e3ef4aa9a204@linaro.org>
 <20221117165806.00007f55@huawei.com>
 <CAL_JsqJ980WdxiUzUSp+p9qTA_BA-n0e_+5qp9Kbw9==MoQpXw@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAL_JsqJ980WdxiUzUSp+p9qTA_BA-n0e_+5qp9Kbw9==MoQpXw@mail.gmail.com>
Precedence: bulk

On Mon, Dec 05, 2022 at 05:36:12PM -0600, Rob Herring wrote:
> On Thu, Nov 17, 2022 at 10:58 AM Jonathan Cameron
> <Jonathan.Cameron@huawei.com> wrote:
> >
> > On Thu, 17 Nov 2022 17:21:25 +0100
> > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:
> >
> > > On 17/11/2022 16:56, Jonathan Cameron wrote:
> > > > On Thu, 17 Nov 2022 13:28:33 +0100
> > > > Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote:
> > > >
> > > >> On 17/11/2022 13:22, Manivannan Sadhasivam wrote:
> > > >>> On Thu, Nov 17, 2022 at 01:13:07PM +0100, Krzysztof Kozlowski wrote:
> > > >>>> The defines from include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h were
> > > >>>> changed to take sid argument:
> > > >>>>
> > > >>>>   Error: Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.example.dts:99.28-29 syntax error
> > > >>>>
> > > >>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > > >>>
> > > >>> Looks like I didn't rebase on top of Bjorn's for-next for my series, so didn't
> > > >>> see this example.
> > > >>>
> > > >>> Thanks for fixing!
> > > >>>
> > > >>> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> > > >>>
> > > >>
> > > >> This should not go via Bjorn's tree without IIO ack and
> > > >> Jonathan/Lars-Peter/IIO lists were not in CC.
> > > >>
> > > > Thanks for the heads up.
> > > >
> > > > Not sure I'd have registered there would have been a problem here even
> > > > if I had seen original patch.  Anyhow, I assume Bjorn will pick this up
> > > > and all will be well again.
> > > >
> > > > Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> > >
> > > I am afraid it cannot go via Bjorn's tree, because this depends on a
> > > change in your tree:
> > > https://lore.kernel.org/all/20221027143411.277980-2-krzysztof.kozlowski@linaro.org/
> > >
> > > Can you pick it up instead? This is the only way to fix the linux-next,
> > > although your tree will have a dt_binding_check error.
> > >
> > > Other way is to have cross-tree merge, but the commit to bindings
> > > headers ended up in DTS patch, so it cannot be shared with driver tree.
> >
> > Ah. I've sent Greg a pull reuqest including that patch, so this is going to get
> > worse and the linux-next intermediate builds are going to fail which is never good.
> >
> > Best bet at this point may be for Bjorn to also take the dependency
> > you list above and the fix.
> >
> > Git will happily unwind the same patch turning up in two trees and
> > that way he'll have everything and the IIO tree  + char-misc will
> > be fine on their own as well.
> >
> > That work for everyone?
> 
> linux-next is failing still. Is someone going to sort this out?
> 

I've picked up the dependency followed by Krzysztof's patch, and
notified Stephen about the expected merge conflict between our trees.

The result do pass dt_binding_check of this binding.

Regards,
Bjorn