From: Mark Brown <broonie@kernel.org>
To: Srinivas Kandagatla <srini@kernel.org>
Cc: Alexander Koskovich <akoskovich@pm.me>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jingyi Wang <jingyi.wang@oss.qualcomm.com>,
Komal Bajaj <komal.bajaj@oss.qualcomm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>,
Pankaj Patil <pankaj.patil@oss.qualcomm.com>,
Varadarajan Narayanan <varadarajan.narayanan@oss.qualcomm.com>
Subject: linux-next: manual merge of the nvmem tree with the char-misc tree
Date: Fri, 31 Jul 2026 16:10:29 +0100 [thread overview]
Message-ID: <amy65RkyQOShgG9z@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 2199 bytes --]
Hi all,
Today's linux-next merge of the nvmem tree got a conflict in:
Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
between commits:
1123dc1ae35f8 ("dt-bindings: nvmem: qfprom: Add glymur compatible")
ec4b806d0c7e6 ("dt-bindings: nvmem: qfprom: qcom: Add Hawi compatible")
ef558843eff49 ("dt-bindings: nvmem: qfprom: Add Milos compatible")
31a75f07b9e90 ("dt-bindings: nvmem: qcom,qfprom: Add Shikra compatible")
from the char-misc tree and commits:
c33862c0a3a9a ("dt-bindings: nvmem: qfprom: Add glymur compatible")
c896d1c34f2bb ("dt-bindings: nvmem: qfprom: qcom: Add Hawi compatible")
9f902e68cfe33 ("dt-bindings: nvmem: qfprom: Add Milos compatible")
ac0a5d17aa3cc ("dt-bindings: nvmem: qcom,qfprom: Add Shikra compatible")
a0366c432e838 ("dt-bindings: nvmem: qfprom: Add ipq5210 & ipq9650 compatible")
314ac2403ac96 ("dt-bindings: nvmem: qfprom: Add compatible for Qualcomm Maili")
from the nvmem 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.
diff --combined Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
index 8134ddb54e130,566304ed4c786..0000000000000
--- a/Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
+++ b/Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
@@@ -22,13 -22,16 +22,16 @@@ properties
- qcom,glymur-qfprom
- qcom,hawi-qfprom
- qcom,ipq5018-qfprom
+ - qcom,ipq5210-qfprom
- qcom,ipq5332-qfprom
- qcom,ipq5424-qfprom
- qcom,ipq6018-qfprom
- qcom,ipq8064-qfprom
- qcom,ipq8074-qfprom
- qcom,ipq9574-qfprom
+ - qcom,ipq9650-qfprom
- qcom,kaanapali-qfprom
+ - qcom,maili-qfprom
- qcom,milos-qfprom
- qcom,msm8226-qfprom
- qcom,msm8916-qfprom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-07-31 15:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-31 15:10 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-07-20 14:59 linux-next: manual merge of the nvmem tree with the char-misc tree Mark Brown
2022-02-23 21:26 broonie
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=amy65RkyQOShgG9z@sirena.org.uk \
--to=broonie@kernel.org \
--cc=akoskovich@pm.me \
--cc=gregkh@linuxfoundation.org \
--cc=jingyi.wang@oss.qualcomm.com \
--cc=komal.bajaj@oss.qualcomm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mukesh.ojha@oss.qualcomm.com \
--cc=pankaj.patil@oss.qualcomm.com \
--cc=srini@kernel.org \
--cc=varadarajan.narayanan@oss.qualcomm.com \
/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