All of lore.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>,
	Joao Martins <joao.m.martins@oracle.com>,
	Joerg Roedel <jroedel@suse.de>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	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: Thu, 2 Nov 2023 21:33:35 -0300	[thread overview]
Message-ID: <20231103003335.GB4488@nvidia.com> (raw)
In-Reply-To: <20231103105312.58a99ef5@canb.auug.org.au>

On Fri, Nov 03, 2023 at 10:53:12AM +1100, Stephen Rothwell wrote:
> > I have used the conflict resolution below now.
> 
> This is now a conflict between the iommu tree and Linus' tree.

My PR has instructions for the resolution to both:

https://lore.kernel.org/linux-iommu/20231031131417.GA1815719@nvidia.com/

Thanks,
Jason 



  reply	other threads:[~2023-11-03  0:33 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-27  4:55 linux-next: manual merge of the iommufd tree with the iommu tree 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 [this message]
  -- 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-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-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=20231103003335.GB4488@nvidia.com \
    --to=jgg@nvidia.com \
    --cc=joao.m.martins@oracle.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 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.