From: Catalin Marinas <catalin.marinas@arm.com>
To: Mark Brown <broonie@kernel.org>
Cc: Konrad Dybcio <konradybcio@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Andy Gross <agross@kernel.org>,
"Aneesh Kumar K.V" <aneesh.kumar@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the qcom tree with the arm64 tree
Date: Tue, 29 Sep 2026 14:38:31 +0100 [thread overview]
Message-ID: <aru_PkpSpqgJlFBg@arm.com> (raw)
In-Reply-To: <arZgzLfF0qjEXPpO@sirena.org.uk>
On Fri, Sep 25, 2026 at 12:53:48PM +0100, Mark Brown wrote:
> Today's linux-next merge of the qcom tree got a conflict in:
>
> include/linux/mod_devicetable.h
>
> between commit:
>
> fe7f2a8054433 ("firmware: smccc: Add an Arm SMCCC bus")
>
> from the arm64 tree and commit:
>
> fe7f2a8054433 ("firmware: smccc: Add an Arm SMCCC bus")
>
> from the qcom tree.
Why does the qcom tree carry these patches? I have a stable branch if
they need them.
--
Catalin
next prev parent reply other threads:[~2026-09-29 13:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-25 11:53 linux-next: manual merge of the qcom tree with the arm64 tree Mark Brown
2026-09-29 13:38 ` Catalin Marinas [this message]
2026-09-29 14:04 ` Mark Brown
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=aru_PkpSpqgJlFBg@arm.com \
--to=catalin.marinas@arm.com \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=aneesh.kumar@kernel.org \
--cc=broonie@kernel.org \
--cc=konradybcio@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.