From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
Rob Herring <robh@kernel•org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Jingyi Wang <quic_jingyw@quicinc•com>,
Lijuan Gao <quic_lijuang@quicinc•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Srinivas Kandagatla <srinivas.kandagatla@linaro•org>
Subject: linux-next: manual merge of the char-misc tree with the devicetree tree
Date: Tue, 7 Jan 2025 14:43:12 +1100 [thread overview]
Message-ID: <20250107144312.0cea97e9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-01-07 3:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-07 3:43 Stephen Rothwell [this message]
2025-01-07 7:34 ` linux-next: manual merge of the char-misc tree with the devicetree tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2023-04-14 15:13 broonie
2023-04-15 5:52 ` Greg KH
2023-04-11 3:57 Stephen Rothwell
2023-04-11 7:33 ` Greg KH
2023-04-11 7:41 ` Miquel Raynal
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=20250107144312.0cea97e9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=quic_jingyw@quicinc$(echo .)com \
--cc=quic_lijuang@quicinc$(echo .)com \
--cc=robh@kernel$(echo .)org \
--cc=srinivas.kandagatla@linaro$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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