linux-kernel - linux-next: manual merge of the iommufd tree with the mm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240816125429.7a55b08c@canb.auug.org.au>
Date: Fri, 16 Aug 2024 12:54:29 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jason Gunthorpe <jgg@...dia.com>, Andrew Morton
 <akpm@...ux-foundation.org>
Cc: Jason Gunthorpe <jgg@...pe.ca>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Nicolin Chen <nicolinc@...dia.com>
Subject: linux-next: manual merge of the iommufd tree with the mm tree

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"

Content of type "application/pgp-signature" skipped