From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Joerg Roedel <joro@8bytes•org>, Vinod Koul <vkoul@kernel•org>
Cc: Joerg Roedel <jroedel@suse•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Lu Baolu <baolu.lu@linux•intel.com>,
Shuai Xue <xueshuai@linux•alibaba.com>
Subject: linux-next: manual merge of the iommu tree with the dmaengine-fixes tree
Date: Fri, 16 May 2025 16:05:21 +1000 [thread overview]
Message-ID: <20250516160521.6620f401@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 828 bytes --]
Hi all,
Today's linux-next merge of the iommu tree got a conflict in:
drivers/dma/idxd/init.c
between commit:
a409e919ca32 ("dmaengine: idxd: Refactor remove call with idxd_cleanup() helper")
from the dmaengine-fixes tree and commit:
853b01b5efd7 ("dmaengine: idxd: Remove unnecessary IOMMU_DEV_FEAT_IOPF")
from the iommu tree.
I fixed it up (the latter removed a subset of whe the former removed in
idxd_remove()) and can carry the fix as necessary. This is now fixed as
far as linux-next is concerned, but any non trivial conflicts should be
mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2025-05-16 6:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20250516160521.6620f401@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=baolu.lu@linux$(echo .)intel.com \
--cc=joro@8bytes$(echo .)org \
--cc=jroedel@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=vkoul@kernel$(echo .)org \
--cc=xueshuai@linux$(echo .)alibaba.com \
/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