Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Date:   Thu, 12 Oct 2023 13:44:42 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Arnd Bergmann <arnd@arndb.de>
Cc:     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: linux-next: manual merge of the tip tree with the asm-generic tree
Message-ID: <20231012134442.16f3f9f6@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ojGD2S=ebZhri7+doRSErDx";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/ojGD2S=ebZhri7+doRSErDx
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/ia64/include/asm/cpu.h
  arch/ia64/kernel/topology.c

between commit:

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

from the asm-generic tree and commit:

  c4dd854f740c ("cpu-hotplug: Provide prototypes for arch CPU registration")

from the tip tree.

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.

--=20
Cheers,
Stephen Rothwell

--Sig_/ojGD2S=ebZhri7+doRSErDx
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUnXZoACgkQAVBC80lX
0Gz4OAf/XInZvSp7D9t2YrAkcIm4FHOOVF8XYTFYDd4TRWsQ2WpWEQaZN3B5b0EQ
CPipnh8QDKk7Xvg8iPPkTti468C/lrswneW0kkyxPjBK06eOU6Wfl++1nNkphcov
GeVv0mIhXFy1PXcb01EtfjPLfwX2h7mgdlU6B8GsynB7ZUfW8bSSRlqmpLgGOV6k
5yDiUcdwDYVkct4R00WDwO7ANF7F2rpyWz9wftvkFyCe2xIin+T3hcRjeey2fJA6
WuAHijMRRlkMPAiTvddDIE2T25U+XiC0m+0oLHDvXqAmexr7gR6qnNMzDR/s075a
7+JieTP1W4PM87RYOG1/DS7X9RnYKg==
=EFxs
-----END PGP SIGNATURE-----

--Sig_/ojGD2S=ebZhri7+doRSErDx--