linux-kernel - linux-next: manual merge of the devicetree tree with the qcom 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>] [day] [month] [year] [list]

Message-ID: <20241105144435.1d80d910@canb.auug.org.au>
Date: Tue, 5 Nov 2024 14:44:35 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Rob Herring <robh@...nel.org>, Andy Gross <agross@...nel.org>
Cc: Abel Vesa <abel.vesa@...aro.org>, Bjorn Andersson
 <andersson@...nel.org>, Jingyi Wang <quic_jingyw@...cinc.com>, 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 devicetree tree with the qcom tree

Hi all,

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

  Documentation/devicetree/bindings/cache/qcom,llcc.yaml

between commit:

  a83e18ca8358 ("dt-bindings: cache: qcom,llcc: Document the QCS8300 LLCC")

from the qcom tree and commit:

  f9759e2b5704 ("dt-bindings: cache: qcom,llcc: Fix X1E80100 reg entries")

from the devicetree tree.

I fixed it up (the 3 way diff comes out empty) 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

Content of type "application/pgp-signature" skipped