Hi all,
Today's linux-next merge of the staging tree got a conflict in:
Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
between commit:
41fb845621ea ("dt-bindings: Another round of adding missing 'additionalProperties'")
from the devicetree tree and commit:
3b17dd220432 ("dt-bindings: iio: adc: exynos-adc: require second interrupt with touch screen")
from the staging tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
index 16d76482b4ff,37d6591ff78c..000000000000
--- a/Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
+++ b/Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml
@@@ -107,8 -109,15 +109,17 @@@ allOf
items:
- const: adc
+ - if:
+ required:
+ - has-touchscreen
+ then:
+ properties:
+ interrupts:
+ minItems: 2
+ maxItems: 2
+
+additionalProperties: false
+
examples:
- |
adc: adc@12d10000 {
Attachment:
pgpzPy7GxLjlv.pgp
Description: OpenPGP digital signature
