linux-next: manual merge of the ftrace tree with the iommu tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the ftrace tree got a conflict in:

  kernel/fork.c

between commit:

  cd3891158a77 ("iommu/sva: Move PASID helpers to sva code")

from the iommu tree and commit:

  fd593511cdfc ("tracing/user_events: Track fork/exec/exit for mm lifetime")

from the ftrace 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 kernel/fork.c
index 4a8f43aa554d,efb1f2257772..000000000000
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@@ -97,7 -97,7 +97,8 @@@
  #include <linux/io_uring.h>
  #include <linux/bpf.h>
  #include <linux/stackprotector.h>
 +#include <linux/iommu.h>
+ #include <linux/user_events.h>
  
  #include <asm/pgalloc.h>
  #include <linux/uaccess.h>

Attachment: pgpwVk9x_7arZ.pgp
Description: OpenPGP digital signature