Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
Date:   Thu, 19 Oct 2023 15:19:27 +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: Re: linux-next: manual merge of the tip tree with the efi-fixes
 tree
Message-ID: <20231019151927.2a20d800@canb.auug.org.au>
In-Reply-To: <20231019145404.63bd38ca@canb.auug.org.au>
References: <20231019145404.63bd38ca@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Nu1=GzIZq1fgE2iaHx6JLVK";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Nu1=GzIZq1fgE2iaHx6JLVK
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 19 Oct 2023 14:54:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>=20
>   drivers/firmware/efi/libstub/x86-stub.c
>=20
> between commit:
>=20
>   db7724134c26 ("x86/boot: efistub: Assign global boot_params variable")
>=20
> from the efi-fixes tree and commit:
>=20
>   50dcc2e0d62e ("x86/boot: efistub: Assign global boot_params variable")
>=20
> from the tip tree.
>=20
> 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.

Well, that didn't work :-(

I ave used the latter version (i.e. the tip tree one) this time.

--=20
Cheers,
Stephen Rothwell

--Sig_/Nu1=GzIZq1fgE2iaHx6JLVK
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUwrk8ACgkQAVBC80lX
0GxGUwf6Au6HrVYERwExXwObgn3HjPSeMtJnB5DI57PGkUUv07A6WAW3QZHY1Nuf
F1WEMsKe3yNYkS0Y4h/48C7Y7Tfaz702+gF8YxOauZyMzLWZfZk8DiR7VisIQDa+
9yqsrV7dNqFkUQ+7TAQXGrouxRfc20RZB2cmlLfqI7RtW5RRZ+IjarENzb59dFrM
Otly3MmAo7J24smX+o1KgnRF6ijFLRPFKlsNbbe9Rt2nQqVdy3jmyaeKp1DJiNP3
eTZVRg5eVleFQ5wTl7bmbGPBOqGovIILml5wWZlQFblh6kxLLp7fKGyo9rs1li5d
x1ILa5BrrM/NQ/wHmCssV/84XJa+ag==
=2arr
-----END PGP SIGNATURE-----

--Sig_/Nu1=GzIZq1fgE2iaHx6JLVK--