From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>, Joerg Roedel <joro@8bytes.org>
Cc: David Heidelberg <david@ixit.cz>,
Konrad Dybcio <konrad.dybcio@somainline.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rob Herring <robh@kernel.org>, Will Deacon <will@kernel.org>
Subject: linux-next: manual merge of the devicetree tree with the iommu tree
Date: Fri, 29 Oct 2021 13:18:54 +1100 [thread overview]
Message-ID: <20211029131854.042d8202@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1379 bytes --]
Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/iommu/arm,smmu.yaml
between commit:
e4a40f15b031 ("dt-bindings: arm-smmu: Add compatible for SM6350 SoC")
from the iommu tree and commit:
e6b331271d41 ("dt-bindings: arm-smmu: Add compatible for the SDX55 SoC")
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.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/devicetree/bindings/iommu/arm,smmu.yaml
index f66a3effba73,5ccf0025ffa9..000000000000
--- a/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
+++ b/Documentation/devicetree/bindings/iommu/arm,smmu.yaml
@@@ -38,7 -37,7 +38,8 @@@ properties
- qcom,sc7280-smmu-500
- qcom,sc8180x-smmu-500
- qcom,sdm845-smmu-500
+ - qcom,sdx55-smmu-500
+ - qcom,sm6350-smmu-500
- qcom,sm8150-smmu-500
- qcom,sm8250-smmu-500
- qcom,sm8350-smmu-500
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-10-29 2:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-29 2:18 Stephen Rothwell [this message]
2021-10-29 13:46 ` linux-next: manual merge of the devicetree tree with the iommu tree Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211029131854.042d8202@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=david@ixit.cz \
--cc=joro@8bytes.org \
--cc=konrad.dybcio@somainline.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robh@kernel.org \
--cc=robherring2@gmail.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox