From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jason Gunthorpe <jgg@nvidia•com>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Jason Gunthorpe <jgg@ziepe•ca>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Nicolin Chen <nicolinc@nvidia•com>
Subject: Re: linux-next: manual merge of the iommufd tree with the mm tree
Date: Mon, 23 Sep 2024 09:24:41 +1000 [thread overview]
Message-ID: <20240923092441.23da0552@canb.auug.org.au> (raw)
In-Reply-To: <20240816125429.7a55b08c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1754 bytes --]
Hi all,
On Fri, 16 Aug 2024 12:54:29 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the iommufd tree got a conflict in:
>
> drivers/iommu/iommufd/selftest.c
>
> between commit:
>
> e843cce9dd23 ("fault-inject-improve-build-for-config_fault_injection=n-fix")
>
> from the mm-nonmm-unstable branch of the mm tree and commit:
>
> 4be8b00b2b0f ("iommufd: Reorder include files")
>
> 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.
>
> diff --cc drivers/iommu/iommufd/selftest.c
> index 6bfb7fa5da7d,b60687f57bef..000000000000
> --- a/drivers/iommu/iommufd/selftest.c
> +++ b/drivers/iommu/iommufd/selftest.c
> @@@ -3,14 -3,13 +3,14 @@@
> *
> * Kernel side components to support tools/testing/selftests/iommu
> */
> - #include <linux/slab.h>
> - #include <linux/iommu.h>
> - #include <linux/xarray.h>
> - #include <linux/file.h>
> - #include <linux/debugfs.h>
> #include <linux/anon_inodes.h>
> ++#include <linux/debugfs.h>
> #include <linux/fault-inject.h>
> + #include <linux/file.h>
> + #include <linux/iommu.h>
> #include <linux/platform_device.h>
> + #include <linux/slab.h>
> + #include <linux/xarray.h>
> #include <uapi/linux/iommufd.h>
>
> #include "../iommu-priv.h"
This is now a conflict between the iommufd tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2024-09-22 23:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-16 2:54 linux-next: manual merge of the iommufd tree with the mm tree Stephen Rothwell
2024-09-22 23:24 ` Stephen Rothwell [this message]
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=20240923092441.23da0552@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=jgg@nvidia$(echo .)com \
--cc=jgg@ziepe$(echo .)ca \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nicolinc@nvidia$(echo .)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