linux-next.vger.kernel.org archive mirror
 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>,
	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 iommufd tree with the iommu tree
Date: Fri, 4 Nov 2022 09:33:28 -0300	[thread overview]
Message-ID: <Y2UGmM7nP32KUfmo@nvidia.com> (raw)
In-Reply-To: <20221104152434.7233ed45@canb.auug.org.au>

On Fri, Nov 04, 2022 at 03:24:34PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the iommufd tree got conflicts in:
> 
>   drivers/iommu/iommu.c
>   include/linux/iommu.h
> 
> between commits from the iommu and iommufd trees.
> 
> I don't have time to disentangle this, so I have just dropped the iommufd
> tree for today.  Please coordinate.

Urk - this is caused by merging the Intel SVA cleanup series into the
iommu tree

Most likely I'll have to take commit 69e61edebea0 ("Merge tag
'for-joerg' of
git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd into core")
from the iommu tree as a shared branch

Check again tomorrow please

Thanks,
Jason

  reply	other threads:[~2022-11-04 12:33 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-04  4:24 linux-next: manual merge of the iommufd tree with the iommu tree Stephen Rothwell
2022-11-04 12:33 ` Jason Gunthorpe [this message]
2022-11-04 19:21   ` Jason Gunthorpe
2023-08-16  6:21 Stephen Rothwell
2023-10-11  5:03 Stephen Rothwell
2023-10-11 13:58 ` Jason Gunthorpe
2023-10-23  4:56 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-25  4:44 Stephen Rothwell
2023-10-25 12:17 ` Jason Gunthorpe
2023-11-02 23:53 ` Stephen Rothwell
2023-10-26  3:27 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

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=Y2UGmM7nP32KUfmo@nvidia.com \
    --to=jgg@nvidia.com \
    --cc=joro@8bytes.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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).