Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Fri, 3 Nov 2023 08:34:02 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     Arnd Bergmann <arnd@arndb.de>, Ard Biesheuvel <ardb@kernel.org>,
        Baoquan He <bhe@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the asm-generic tree with the mm
 tree
Message-ID: <20231103083402.6d8cc7d2@canb.auug.org.au>
In-Reply-To: <20230918101027.7506b71e@canb.auug.org.au>
References: <20230918101027.7506b71e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/cQl1LrOmM=j1cchgpHoaltm";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/cQl1LrOmM=j1cchgpHoaltm
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 18 Sep 2023 10:10:27 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the asm-generic tree got a conflict in:
>=20
>   arch/ia64/kernel/setup.c
>=20
> between commit:
>=20
>   52f40d9a3c11 ("crash_core: change the prototype of function parse_crash=
kernel()")
>=20
> from the mm tree and commit:
>=20
>   cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
>=20
> from the asm-generic tree.
>=20
> I fixed it up (I removed the file) 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.

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

--=20
Cheers,
Stephen Rothwell

--Sig_/cQl1LrOmM=j1cchgpHoaltm
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVEFcoACgkQAVBC80lX
0GwW6Qf/fSluccY/3iDJ4vilm2o4OKokc0WdzboftFaHhuEqUITrz4OKBaQbRHKy
PPO2rFcztzRammqLYbASC95CtLN/Tqj5dTwzRBThyKtE90+6z/xvabjL4OH3rTzq
ZjgsPbew43nJEKyrjxyAug2/LM60xLmYEb90YJn26DCppM4ayuXA/FORcvBQ5ij6
Khp+w6w9Hcq0fbd8YN/DE2r6H69AMrXap5YdIiwB/+pGyjj+TKrv71UC2nwBAXPm
90eElpdPz5obK2A9mP0OBMiTcrL7yLyqt7chyH3sMdZv2zCmcnptiVp04oW9Gych
Nlf4HCUaowP65/O1rjmCXE7vnq2ySg==
=9pgm
-----END PGP SIGNATURE-----

--Sig_/cQl1LrOmM=j1cchgpHoaltm--