Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
Date:   Mon, 18 Sep 2023 10:10:27 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Arnd Bergmann <arnd@arndb.de>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     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: linux-next: manual merge of the asm-generic tree with the mm tree
Message-ID: <20230918101027.7506b71e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/cHTpL9FtrLeFl5GD6seFh+R";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/cHTpL9FtrLeFl5GD6seFh+R
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/ia64/kernel/setup.c

between commit:

  52f40d9a3c11 ("crash_core: change the prototype of function parse_crashke=
rnel()")

from the mm tree and commit:

  cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")

from the asm-generic tree.

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.

--=20
Cheers,
Stephen Rothwell

--Sig_/cHTpL9FtrLeFl5GD6seFh+R
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUHlXMACgkQAVBC80lX
0GydHgf9GlJwZi5rdrHCWVGYziJ/n+unRVeA9zawFk8koP9kCrspDwlRP/MhCTxZ
iWjEWGqcM2jtOipr0ueEkD+vnQJKaT6M//J67kSQ073S/qGhqEL9XwlxFlE/PLlV
3AQhxRwpzKjpRs/iEBlgdEKz2zlGwvO61iW5Mj0RHLbypNQr5LVFipNSffKgI/jR
ltVnV/V7BhT4uWfIiB0s1AZWlU+VRxuhrRnOKfRT0gk2f5aaaYWgOD4LDjtEYF9+
2SN+Nz7A9RZBl6whHQMUTUHeaAVdMzEAUcKGTJK9lsWovURMK/zZFl0O8rntQB0e
0kn2ybNujUrCxiWUayPweF1MBUh8tg==
=Mpwn
-----END PGP SIGNATURE-----

--Sig_/cHTpL9FtrLeFl5GD6seFh+R--