Re: [PATCH 1/2] dt-bindings: arm: cpus: Restore qcom,oryon-1-4 compatible

Shawn Guo
2026-04-13T12:06:43Z

+ 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/