Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
Date:   Mon, 16 Oct 2023 09:15:24 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Arnd Bergmann <arnd@arndb.de>
Cc:     Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Ard Biesheuvel <ardb@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
Subject: Re: linux-next: manual merge of the tip tree with the asm-generic
 tree
Message-ID: <20231016091524.1c1cb83d@canb.auug.org.au>
In-Reply-To: <20231012134442.16f3f9f6@canb.auug.org.au>
References: <20231012134442.16f3f9f6@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/lkygVc3XrOh=7+t/HOg/eKR";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/lkygVc3XrOh=7+t/HOg/eKR
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 12 Oct 2023 13:44:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>=20
>   arch/ia64/include/asm/cpu.h
>   arch/ia64/kernel/topology.c
>=20
> between commit:
>=20
>   cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
>=20
> from the asm-generic tree and commit:
>=20
>   c4dd854f740c ("cpu-hotplug: Provide prototypes for arch CPU registratio=
n")
>=20
> from the tip tree.
>=20
> I fixed it up (I deleted the files) 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 Linus' tree and the asm-generic tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/lkygVc3XrOh=7+t/HOg/eKR
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUsZHwACgkQAVBC80lX
0Gz8Jwf+OVt4TOXztb6+gkPNtlgOweAvRVAKi4pq0ETol1kXTRo2VPjbT0ZAM2OP
m2iAG+HLlBU6Z0LOOv2XizamwexfRD2/mOh4VRgw//KQaPBeB5FYmXsT1UDRgbCL
5BXvJGf0lyBoPG6TNrJ5rWmmXP03n9X8G9tzY4RuRjNf3pj/OvYCOKbJ6FarEvVM
rS4oBWqbOrKeBupgBFJ2/Ka0qJMwyJJaIlxc9kyp5UqzWRgDnv1D7vEe828FSe/5
P3bj1XMC3JRD3exaWA8iugVSHTInKA1YRCp+t5gP9KFfxLRCeeAJztKZpSEVr2fq
WCtf0IoT3lOMndMHgnojCW6wSf3btg==
=1sCY
-----END PGP SIGNATURE-----

--Sig_/lkygVc3XrOh=7+t/HOg/eKR--