From: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
To: Mark Brown <broonie@kernel.org>, Paul Moore <paul@paul-moore.com>,
Rob Herring <robh@kernel.org>
Cc: Bjorn Andersson <andersson@kernel.org>,
Janne Grunau <j@jannau.net>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rob Herring <robh@kernel.org>,
Sibi Sankar <sibi.sankar@oss.qualcomm.com>
Subject: Re: linux-next: manual merge of the audit tree with the arm-soc tree
Date: Wed, 8 Apr 2026 16:36:24 +0200 [thread overview]
Message-ID: <987525ee-b137-4c16-9d18-ee445703fe11@oss.qualcomm.com> (raw)
In-Reply-To: <adZi-3jHeX0UhURc@sirena.org.uk>
On 08/04/2026 16:15, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the audit tree got a conflict in:
>
> Documentation/devicetree/bindings/arm/cpus.yaml
>
> between commit:
>
> 96e71f817b02c ("dt-bindings: arm: cpus: Extend Qualcomm Oryon compatibles")
>
> from the arm-soc tree and commits:
>
> 0220405d7e099 ("dt-bindings: arm: cpus: Deprecate Qualcomm generic compatibles")
> d08082a872f08 ("dt-bindings: arm: cpus: Add Apple M3 CPU core compatibles")
>
> from the audit tree.
I think that's not audit tree, but Rob's DT tree (+Cc).
Best regards,
Krzysztof
prev parent reply other threads:[~2026-04-08 14:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-08 14:15 linux-next: manual merge of the audit tree with the arm-soc tree Mark Brown
2026-04-08 14:36 ` Krzysztof Kozlowski [this message]
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=987525ee-b137-4c16-9d18-ee445703fe11@oss.qualcomm.com \
--to=krzysztof.kozlowski@oss.qualcomm.com \
--cc=andersson@kernel.org \
--cc=broonie@kernel.org \
--cc=j@jannau.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=robh@kernel.org \
--cc=sibi.sankar@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