linux-kernel - linux-next: manual merge of the staging tree with the devicetree tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20201006184944.22985fd1@canb.auug.org.au>
Date:   Tue, 6 Oct 2020 18:49:44 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Rob Herring <robherring2@...il.com>
Cc:     Jonathan Cameron <Jonathan.Cameron@...wei.com>,
        Krzysztof Kozlowski <krzk@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the staging tree with the devicetree
 tree

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@...10000 {

Content of type "application/pgp-signature" skipped