public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
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, 25 Oct 2023 09:17:09 -0300	[thread overview]
Message-ID: <20231025121709.GC3952@nvidia.com> (raw)
In-Reply-To: <20231025154420.718e27af@canb.auug.org.au>

On Wed, Oct 25, 2023 at 03:44:20PM +1100, Stephen Rothwell wrote:
> diff --cc include/linux/iommu.h
> index b5b254e205c6,f347bf31761f..000000000000
> --- a/include/linux/iommu.h
> +++ b/include/linux/iommu.h
> @@@ -64,8 -66,10 +66,11 @@@ struct iommu_domain_geometry 
>   #define __IOMMU_DOMAIN_DMA_FQ	(1U << 3)  /* DMA-API uses flush queue    */
>   
>   #define __IOMMU_DOMAIN_SVA	(1U << 4)  /* Shared process address space */
>  +#define __IOMMU_DOMAIN_PLATFORM	(1U << 5)
>   
> + #define __IOMMU_DOMAIN_NESTED	(1U << 5)  /* User-managed address space nested
> + 					      on a stage-2 translation        */

One of these should be 6

I'm going to change my tree so __IOMMU_DOMAIN_NESTED is 6

Otherwise looks OK thanks

Jason

  reply	other threads:[~2023-10-25 12:17 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-25  4:44 linux-next: manual merge of the iommufd tree with the iommu tree Stephen Rothwell
2023-10-25 12:17 ` Jason Gunthorpe [this message]
2023-11-02 23:53 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2025-06-30  6:00 Stephen Rothwell
2025-06-30 13:02 ` Jason Gunthorpe
2025-03-21  8:09 Stephen Rothwell
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: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-10-11  5:03 Stephen Rothwell
2023-10-11 13:58 ` Jason Gunthorpe
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=20231025121709.GC3952@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