Received-SPF: pass (google.com: domain of linux-kernel+bounces-156131-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Wed, 24 Apr 2024 12:20:34 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Luis Chamberlain <mcgrof@kernel.org>, Andrew Morton
 <akpm@linux-foundation.org>
Cc: Kent Overstreet <kent.overstreet@linux.dev>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, "Mike Rapoport (IBM)" <rppt@kernel.org>,
 Suren Baghdasaryan <surenb@google.com>
Subject: linux-next: manual merge of the modules tree with the mm tree
Message-ID: <20240424122034.5b4a1a01@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/H/+E5WcEms/IdccAZrVLtmR";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/H/+E5WcEms/IdccAZrVLtmR
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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_MO=
DULES")

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.

--=20
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>
 =20
  #include <asm/swiotlb.h>
  #include <asm/machdep.h>

--Sig_/H/+E5WcEms/IdccAZrVLtmR
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYobHIACgkQAVBC80lX
0GzHLwf/T0fiy+3h+FiR5SrA3FMVBpVHDjptBdZ5nzyZr5xWmJe4ZzTwbD1TMY87
KEWJMusc2M1mAhqKzzGXxNASMCvctLW5qYo7LijJamkQIs9SwUObV4QQAUrtTkTD
jABxLGZ5vhqRwGyeejPc/8XKw1oZvMWhFcWdlNedKXE7P38F2XiDES1Q8UITQ2No
Ekd1t/2BiwoLQbiDFaf38eUnqsxTc47kVMkBAJD3TiTOmqk15exovN7oPOBiX0KD
IOPVU97iD1VcFX4tPC88V5fk/FcObyRXZQyPe8US5kinjI3WkpeV2qLUUk6tI31x
w+EOh9lv0Wdb2vW/RclVyrPZ8ned6w==
=GpxW
-----END PGP SIGNATURE-----

--Sig_/H/+E5WcEms/IdccAZrVLtmR--