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  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [day] [month] [year] [list]
Date:   Fri, 15 May 2020 15:28:38 +1000
From:   Stephen Rothwell <>
To:     Rob Herring <>,
        David Miller <>,
        Networking <>
Cc:     Linux Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Alex Elder <>
Subject: linux-next: manual merge of the devicetree tree with the net-next

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:


between commit:

  8456c54408a2 ("dt-bindings: net: add IPA iommus property")

from the net-next tree and commit:

  fba5618451d2 ("dt-bindings: Fix incorrect 'reg' property sizes")

from the devicetree 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.

Stephen Rothwell

diff --cc Documentation/devicetree/bindings/net/qcom,ipa.yaml
index 7b749fc04c32,b2ac7606095b..000000000000
--- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml
+++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml
@@@ -171,10 -162,9 +169,10 @@@ examples
                  modem-remoteproc = <&mss_pil>;
 +                iommus = <&apps_smmu 0x720 0x3>;
-                 reg = <0 0x1e40000 0 0x7000>,
-                         <0 0x1e47000 0 0x2000>,
-                         <0 0x1e04000 0 0x2c000>;
+                 reg = <0x1e40000 0x7000>,
+                         <0x1e47000 0x2000>,
+                         <0x1e04000 0x2c000>;
                  reg-names = "ipa-reg",

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists