From: Krzysztof Kozlowski <krzysztof.kozlowski@oss•qualcomm.com>
To: Mark Brown <broonie@kernel•org>, Joerg Roedel <joro@8bytes•org>
Cc: Arnd Bergmann <arnd@arndb•de>,
Benjamin Gaignard <benjamin.gaignard@collabora•com>,
Joerg Roedel <joerg.roedel@amd•com>,
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 iommu tree with the arm-soc tree
Date: Mon, 18 May 2026 17:17:07 +0200 [thread overview]
Message-ID: <ff150272-c748-48e4-8273-3487278f3d71@oss.qualcomm.com> (raw)
In-Reply-To: <agsOzbfiOszzuUvk@sirena.org.uk>
On 18/05/2026 15:06, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the iommu tree got a conflict in:
>
> arch/arm64/configs/defconfig
>
> between commit:
>
> f54f7979ff88d ("arm64: defconfig: Move entries to match savedefconfig")
>
> from the arm-soc tree and commit:
>
> 187029b922d0e ("arm64: defconfig: enable Verisilicon IOMMU for Rockchip RK3588")
This patch should rather not be taken by iommu tree.
Just like DTS this is patch for SoC platform. Joerg, could you drop it?
It's better if SoC platform maintainer handles the conflicts.
Best regards,
Krzysztof
next prev parent reply other threads:[~2026-05-18 15:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-18 13:06 linux-next: manual merge of the iommu tree with the arm-soc tree Mark Brown
2026-05-18 15:17 ` Krzysztof Kozlowski [this message]
2026-05-19 8:56 ` Joerg Roedel
-- strict thread matches above, loose matches on Subject: below --
2022-05-06 2:39 Stephen Rothwell
2016-02-29 4:16 Stephen Rothwell
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=ff150272-c748-48e4-8273-3487278f3d71@oss.qualcomm.com \
--to=krzysztof.kozlowski@oss$(echo .)qualcomm.com \
--cc=arnd@arndb$(echo .)de \
--cc=benjamin.gaignard@collabora$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=joerg.roedel@amd$(echo .)com \
--cc=joro@8bytes$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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