From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of the efi-lock-down tree with the modules tree Date: Tue, 17 Apr 2018 20:01:42 +1000 Message-ID: <20180417200142.6eb2c629@canb.auug.org.au> References: <20180417113218.4e6ba307@canb.auug.org.au> <25950.1523951172@warthog.procyon.org.uk> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/gkaOe9cMOGfEGdBt03gB5iK"; protocol="application/pgp-signature" Return-path: In-Reply-To: <25950.1523951172@warthog.procyon.org.uk> Sender: linux-kernel-owner@vger.kernel.org To: David Howells Cc: Jessica Yu , Linux-Next Mailing List , Linux Kernel Mailing List , Jia Zhang List-Id: linux-next.vger.kernel.org --Sig_/gkaOe9cMOGfEGdBt03gB5iK Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi David, On Tue, 17 Apr 2018 08:46:12 +0100 David Howells wrot= e: > > Stephen Rothwell wrote: >=20 > > Today's linux-next merge of the efi-lock-down tree got a conflict in: = =20 >=20 > Can you drop my branch for the moment? Sure, no problem. Just let me know when to grab it again. --=20 Cheers, Stephen Rothwell --Sig_/gkaOe9cMOGfEGdBt03gB5iK Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlrVxgYACgkQAVBC80lX 0GzRcQf/a3OnaBT495zp6dZKXzqp8K6VIre+sq+SujLr1afZPv2FLxqS6fjKPgQv JixVKrBZm9N5Lh3CSxYSE6h5pdKf6fPtUJbCLZG1ddSeihVdPy6QV0UmQltO4MAl axfTinalUg+OYEuBp5yLKoUFryWfFNLMAIP9uxWzyiX/9S9BPmF4adXY/dya56IH F049Lq7EjKMz8tAnALkyjCy3adz8isouKN+9xp/B8/GTEFBiNNLnUFbL1eahDKei j53CsGRx+wiAgjbQgtQLqUnN1KJDx4EPl+6k5iCfrs4KBEjkkF37HSUIAXHc7GAF sECPG+4MSmfYY7ROs0/DoHKzKiytZA== =+/HC -----END PGP SIGNATURE----- --Sig_/gkaOe9cMOGfEGdBt03gB5iK--