* linux-next: Expected merge conflict in iio qcom,spmi-vadc.yaml
@ 2022-12-06 18:12 Bjorn Andersson
2022-12-07 0:51 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Bjorn Andersson @ 2022-12-06 18:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, Jonathan Cameron, Krzysztof Kozlowski, Rob Herring
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@linaro.org/
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: Expected merge conflict in iio qcom,spmi-vadc.yaml
2022-12-06 18:12 linux-next: Expected merge conflict in iio qcom,spmi-vadc.yaml Bjorn Andersson
@ 2022-12-07 0:51 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2022-12-07 0:51 UTC (permalink / raw)
To: Bjorn Andersson
Cc: linux-next, Jonathan Cameron, Krzysztof Kozlowski, Rob Herring,
Greg KH, Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 824 bytes --]
Hi Bjorn,
On Tue, 6 Dec 2022 12:12:09 -0600 Bjorn Andersson <andersson@kernel•org> wrote:
>
> 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@linaro.org/
>
> 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?
No worries, done. I got the conflict when merging the char-misc tree
(Greg and Arnd added to cc).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-07 0:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-06 18:12 linux-next: Expected merge conflict in iio qcom,spmi-vadc.yaml Bjorn Andersson
2022-12-07 0:51 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox