From: Jason Gunthorpe <jgg@nvidia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Joerg Roedel <joro@8bytes.org>, 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>,
Nicolin Chen <nicolinc@nvidia.com>, Yi Liu <yi.l.liu@intel.com>
Subject: Re: linux-next: manual merge of the iommufd tree with the iommu tree
Date: Wed, 11 Oct 2023 10:58:32 -0300 [thread overview]
Message-ID: <20231011135832.GX3952@nvidia.com> (raw)
In-Reply-To: <20231011160357.292c84e3@canb.auug.org.au>
On Wed, Oct 11, 2023 at 04:03:57PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the iommufd tree got a conflict in:
>
> include/linux/iommu.h
>
> between commit:
>
> 4601cd2d7c4c ("iommu: Add ops->domain_alloc_paging()")
>
> from the iommu tree and commit:
>
> 909f4abd1097 ("iommu: Add new iommu op to create domains owned by userspace")
>
> from the iommufd tree.
>
> I fixed it up (see below) 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.
Looks right, thanks
Jason
next prev parent reply other threads:[~2023-10-11 13:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 5:03 linux-next: manual merge of the iommufd tree with the iommu tree Stephen Rothwell
2023-10-11 13:58 ` Jason Gunthorpe [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-27 4:55 Stephen Rothwell
2023-10-27 6:15 ` Stephen Rothwell
2023-10-30 18:26 ` Jason Gunthorpe
2023-10-31 5:12 ` Stephen Rothwell
2023-10-31 11:31 ` Jason Gunthorpe
2023-11-02 23:53 ` Stephen Rothwell
2023-11-03 0:33 ` Jason Gunthorpe
2023-10-26 3:27 Stephen Rothwell
2023-10-25 4:44 Stephen Rothwell
2023-10-25 12:17 ` Jason Gunthorpe
2023-11-02 23:53 ` Stephen Rothwell
2023-10-25 4:34 Stephen Rothwell
2023-10-25 12:12 ` Jason Gunthorpe
2023-10-25 12:16 ` Baolu Lu
2023-10-25 12:17 ` Jason Gunthorpe
2023-10-25 12:25 ` Baolu Lu
2023-10-23 4:56 Stephen Rothwell
2023-08-16 6:21 Stephen Rothwell
2022-11-04 4:24 Stephen Rothwell
2022-11-04 12:33 ` Jason Gunthorpe
2022-11-04 19:21 ` Jason Gunthorpe
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=20231011135832.GX3952@nvidia.com \
--to=jgg@nvidia.com \
--cc=baolu.lu@linux.intel.com \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nicolinc@nvidia.com \
--cc=sfr@canb.auug.org.au \
--cc=yi.l.liu@intel.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;
as well as URLs for NNTP newsgroup(s).