linux-next: Expected merge conflict in iio qcom,spmi-vadc.yaml

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Stephen,

I messed up and picked an IIO DT binding change a while ago without
synchronizing with Jonathan and we've now ended up with a failing
dt_binding_check because of this.

The solution for this is:
https://lore.kernel.org/lkml/20221117121307.264550-1-krzysztof.kozlowski@xxxxxxxxxx/

After considering the various solutions I've picked this up as:
51f7be212ae6 ("dt-bindings: iio: adc: qcom,spmi-vadc: fix PM8350 define")

This does however cause a merge conflict between the qcom- and
iio-trees. Could you please solve this in line with Krzysztof's patch?

Thanks,
Bjorn



[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux