linux-kernel - linux-next: manual merge of the modules 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: <20240424122034.5b4a1a01@canb.auug.org.au>
Date: Wed, 24 Apr 2024 12:20:34 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Luis Chamberlain <mcgrof@...nel.org>, Andrew Morton
 <akpm@...ux-foundation.org>
Cc: Kent Overstreet <kent.overstreet@...ux.dev>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, "Mike Rapoport (IBM)" <rppt@...nel.org>,
 Suren Baghdasaryan <surenb@...gle.com>
Subject: linux-next: manual merge of the modules tree with the mm tree

Hi all,

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

  arch/powerpc/mm/mem.c

between commit:

  c22e503ced5b ("fix missing vmalloc.h includes")

from the mm-unstable branch of the mm tree and commit:

  7aa7eb8269ea ("arch: make execmem setup available regardless of CONFIG_MODULES")

from the modules 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 arch/powerpc/mm/mem.c
index a197d4c2244b,5de62a3c1d4b..000000000000
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@@ -16,7 -16,7 +16,8 @@@
  #include <linux/highmem.h>
  #include <linux/suspend.h>
  #include <linux/dma-direct.h>
 +#include <linux/vmalloc.h>
+ #include <linux/execmem.h>
  
  #include <asm/swiotlb.h>
  #include <asm/machdep.h>

Content of type "application/pgp-signature" skipped