Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
Date:   Mon, 16 Oct 2023 12:38:50 +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>
Cc:     Linus Torvalds <torvalds@linux-foundation.org>,
        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 tip tree with Linus' tree
Message-ID: <20231016123850.2ee3b736@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/M1hrpfEUIEswjPM5GIbRPa.";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/M1hrpfEUIEswjPM5GIbRPa.
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/x86/kernel/smpboot.c

between commit:

  fbe1bf1e5ff1 ("Revert "x86/smp: Put CPUs into INIT on shutdown if possibl=
e"")

from Linus' tree and commit:

  8aa2a4178dc5 ("x86/apic: Use u32 for cpu_present_to_apicid()")

from the tip tree.

I fixed it up (I just used the former which removed the function updated
by the latter) 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_/M1hrpfEUIEswjPM5GIbRPa.
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUslCoACgkQAVBC80lX
0GyUAgf/RJZGINwgeOfRzUbOXJG/EViIRgI66PzwQF39w6QJo81Cw1JDQlyXg7iP
SY1zexkhrjH7+xsMJEfjPEOP2iGIZQwsmHtIX4PH3jvOBcofZXnQCMKoYF5DIuhP
3qlhkvw+2p/4X6oJ/h0AvHZ1Y5lhw0+uMb+L8ZZ1zgsp9pY2zwE1SOjTBhNcIQVc
+QIoJB77DdQAH0tWF4PCYPD/gXqTm7lpOZuJfoEB58pCfRKMaJxT++N0qt/z25m7
VvgDaoMpsOgIY54HJtdDR9fihNTHLdK5b4E03Sg4CZGWR82ljgcaYSz6MlkDhL1e
jQklsLDuf0GDPr1pTCgAYzicB7Zfzw==
=oofA
-----END PGP SIGNATURE-----

--Sig_/M1hrpfEUIEswjPM5GIbRPa.--