linux-kernel - linux-next: manual merge of the char-misc 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: <20250107144312.0cea97e9@canb.auug.org.au>
Date: Tue, 7 Jan 2025 14:43:12 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>, Rob Herring
 <robh@...nel.org>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Jingyi Wang
 <quic_jingyw@...cinc.com>, Lijuan Gao <quic_lijuang@...cinc.com>, Linux
 Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Srinivas Kandagatla
 <srinivas.kandagatla@...aro.org>
Subject: linux-next: manual merge of the char-misc tree with the devicetree
 tree

Hi all,

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

  Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml

between commit:

  38a498a28112 ("dt-bindings: nvmem: qfprom: Add compatible for QCS615")

from the devicetree tree and commit:

  f22a51b0a7cd ("dt-bindings: nvmem: qfprom: Add compatible for QCS8300")

from the char-misc 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/nvmem/qcom,qfprom.yaml
index 38e0d50f0e1c,c03da595804f..000000000000
--- a/Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
+++ b/Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
@@@ -32,7 -34,7 +34,8 @@@ properties
            - qcom,msm8998-qfprom
            - qcom,qcm2290-qfprom
            - qcom,qcs404-qfprom
 +          - qcom,qcs615-qfprom
+           - qcom,qcs8300-qfprom
            - qcom,sc7180-qfprom
            - qcom,sc7280-qfprom
            - qcom,sc8280xp-qfprom

Content of type "application/pgp-signature" skipped