From: Shawn Guo <shengchao.guo@oss.qualcomm.com>
To: Krzysztof Kozlowski <krzk@kernel.org>, Mark Brown <broonie@kernel.org>
Cc: Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konradybcio@kernel.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>,
Deepti Jaggi <deepti.jaggi@oss.qualcomm.com>,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] dt-bindings: arm: cpus: Restore qcom,oryon-1-4 compatible
Date: Mon, 13 Apr 2026 20:06:35 +0800 [thread overview]
Message-ID: <adzcS4loKKXGBbga@QCOM-aGQu4IUr3Y> (raw)
In-Reply-To: <21b3eca0-c8a3-43c3-ad61-f15abedf5c7e@kernel.org>
+ Mark
On Mon, Apr 13, 2026 at 12:01:06PM +0200, Krzysztof Kozlowski wrote:
> On 13/04/2026 11:16, Shawn Guo wrote:
> > It seems that compatible qcom,oryon-1-4 was accidentally dropped during
> > the conflict resolution in commit f6935ae6147b ("Merge branch 'for-next'
>
> Don't reference commits which will never make to Linux kernel.
>
> > of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git").
> > Restore it.
> >
> > Signed-off-by: Shawn Guo <shengchao.guo@oss.qualcomm.com>
>
> Well, I said that merge will be difficult but Mark was sure merge is
> trivial, so here we are.
>
> Anyway, this cannot be applied. How do you exactly see it? Which tree?
> Try yourself...
Ah, right! This can be applied nowhere, as it only fixes Mark's merge
commit on linux-next instead of mainline.
Mark,
I should have copied you from the beginning, but could you take
the patch [1] as a bug report and get linux-next fixed?
Shawn
[1] https://lore.kernel.org/all/20260413091625.607976-2-shengchao.guo@oss.qualcomm.com/
next prev parent reply other threads:[~2026-04-13 12:06 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-13 9:16 [PATCH 0/2] dt-bindings: arm: cpus: Fix and extend Qualcomm Oryon compatibles Shawn Guo
2026-04-13 9:16 ` [PATCH 1/2] dt-bindings: arm: cpus: Restore qcom,oryon-1-4 compatible Shawn Guo
2026-04-13 9:57 ` Konrad Dybcio
2026-04-13 10:01 ` Krzysztof Kozlowski
2026-04-13 12:06 ` Shawn Guo [this message]
2026-04-13 9:16 ` [PATCH 2/2] dt-bindings: arm: cpus: Add compatible qcom,oryon-1-5 Shawn Guo
2026-04-13 9:58 ` Konrad Dybcio
2026-04-13 10:02 ` Krzysztof Kozlowski
2026-04-13 12:36 ` Shawn Guo
2026-04-13 12:40 ` Krzysztof Kozlowski
2026-04-13 13:10 ` Shawn Guo
2026-04-13 13:30 ` Krzysztof Kozlowski
2026-04-13 14:34 ` Shawn Guo
2026-04-13 16:08 ` Krzysztof Kozlowski
2026-04-14 1:21 ` Shawn Guo
2026-04-14 6:23 ` Krzysztof Kozlowski
2026-04-14 6:59 ` Shawn Guo
2026-04-14 7:05 ` Krzysztof Kozlowski
2026-04-14 7:11 ` Krzysztof Kozlowski
2026-04-14 8:01 ` Shawn Guo
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=adzcS4loKKXGBbga@QCOM-aGQu4IUr3Y \
--to=shengchao.guo@oss.qualcomm.com \
--cc=andersson@kernel.org \
--cc=bartosz.golaszewski@oss.qualcomm.com \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=deepti.jaggi@oss.qualcomm.com \
--cc=devicetree@vger.kernel.org \
--cc=konradybcio@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=krzk@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@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