Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
Date:   Thu, 19 Oct 2023 14:54:04 +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>,
        Ard Biesheuvel <ardb@kernel.org>
Cc:     Ingo Molnar <mingo@kernel.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 the efi-fixes tree
Message-ID: <20231019145404.63bd38ca@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/1jUJS3rYAb9ajyeJ.V=mWCb";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/1jUJS3rYAb9ajyeJ.V=mWCb
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

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

  drivers/firmware/efi/libstub/x86-stub.c

between commit:

  db7724134c26 ("x86/boot: efistub: Assign global boot_params variable")

from the efi-fixes tree and commit:

  50dcc2e0d62e ("x86/boot: efistub: Assign global boot_params variable")

from the tip tree.

I fixed it up (I just arbitrarily chose the former) 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_/1jUJS3rYAb9ajyeJ.V=mWCb
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUwqFwACgkQAVBC80lX
0GyTLggAoZJwvyXcO6IHuswXwuo5YVsjqvHIeNiBpj359492u2GbMzo3jJrFb+/T
+jhf6KNd/I9dZl1HwL5vCKywvxTMTZqchOLREpnNcGSe5i1WbdGpkqKMODh7+vNz
ba8nb/qdb0a2Xaaz6b+MNNiQ1hRhfL+bYF2HC2Z3452UVGu0IjPDnSSFZe9JgW0k
CqmKmj4FaUJdk5Q1MAowmGnB7yZrHKOHl8s/Wk7pOgzZhMfEo8wa/R4nve3xt59u
++1POb4n0cuQ5Sxd33Ja/ypxOHabylBhnVOXZadanYfYbZCMZN8m1or2NqpFwYmr
6qAAOt9GpdThB0Hpk09vdT1Y14CJfA==
=/CFs
-----END PGP SIGNATURE-----

--Sig_/1jUJS3rYAb9ajyeJ.V=mWCb--