On 17/11/2022 17:58, Jonathan Cameron wrote: > On Thu, 17 Nov 2022 17:21:25 +0100 > Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> wrote: > >> On 17/11/2022 16:56, Jonathan Cameron wrote: >>> On Thu, 17 Nov 2022 13:28:33 +0100 >>> Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx> 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@xxxxxxxxxx> >>>>> >>>>> 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@xxxxxxxxxx> >>>>> >>>> >>>> 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@xxxxxxxxxx> >> >> 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@xxxxxxxxxx/ >> >> 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? Yes, that's also good solution. You only need this one commit: 22f1d06f4f283e36622036726093032a07d67c0d https://lore.kernel.org/all/20221103095810.64606-2-manivannan.sadhasivam@xxxxxxxxxx/ Best regards, Krzysztof
