Hi all,

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.

-- 
Cheers,
Stephen Rothwell

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"

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