linux-kernel - linux-next: manual merge of the ftrace tree with the iommu 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>] [day] [month] [year] [list]

Message-ID: <20230403144129.250c7095@canb.auug.org.au>
Date:   Mon, 3 Apr 2023 14:41:29 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Steven Rostedt <rostedt@...dmis.org>,
        Masami Hiramatsu <mhiramat@...nel.org>,
        Joerg Roedel <joro@...tes.org>
Cc:     Beau Belgrave <beaub@...ux.microsoft.com>,
        Jacob Pan <jacob.jun.pan@...ux.intel.com>,
        Joerg Roedel <jroedel@...e.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the ftrace tree with the iommu tree

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>

Content of type "application/pgp-signature" skipped