Received-SPF: pass (google.com: domain of linux-kernel+bounces-181636-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: Fri, 17 May 2024 09:26:07 +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: Re: linux-next: manual merge of the modules tree with the mm tree
Message-ID: <20240517092607.0e3ec389@canb.auug.org.au>
In-Reply-To: <20240424122034.5b4a1a01@canb.auug.org.au>
References: <20240424122034.5b4a1a01@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/n=d2tA+c6HS2gE6t_lhUWW5";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/n=d2tA+c6HS2gE6t_lhUWW5
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Wed, 24 Apr 2024 12:20:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the modules tree got a conflict in:
>=20
>   arch/powerpc/mm/mem.c
>=20
> between commit:
>=20
>   c22e503ced5b ("fix missing vmalloc.h includes")
>=20
> from the mm-unstable branch of the mm tree and commit:
>=20
>   7aa7eb8269ea ("arch: make execmem setup available regardless of CONFIG_=
MODULES")
>=20
> from the modules tree.
>=20
> 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
> 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>

This is now a conflict between the mm-stable tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/n=d2tA+c6HS2gE6t_lhUWW5
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZGlg8ACgkQAVBC80lX
0GwBDgf9FtY7Hs3fnXm8wxijL5rA6+ByHFzZSvJZfDUrpX4POlUF4dKw/J5v6iTa
pu1G+rFSGWmrFOW46tj4pXpQaIZ8z9JdahXLSk5gUFvnhDmVm5SyEFBTorPcPIQ2
mE9TfByUROgGPVqsaqUgd/BaiAAkXPBPsRCw9rvD5K8XeQRKEBQ/qF1V6+PYj7Ii
0l2DFqlvvoBzUfHqvd0xgsZdsZfiGPKxrQYQeLxXIrEe7Mek9LnDKbfCojwucteV
G4colzlVvn7CAD8N0giUd9k25OV26SmGQGzRI3cUJuXC6AjaAklfnGDzYmpmAMYH
1MkPVAIpj2VWsC9mdarqhJX0mG2InQ==
=Dm7B
-----END PGP SIGNATURE-----

--Sig_/n=d2tA+c6HS2gE6t_lhUWW5--