Received: by 10.213.65.68 with SMTP id h4csp2167483imn; Sun, 8 Apr 2018 21:29:21 -0700 (PDT) X-Google-Smtp-Source: AIpwx484kBbbsAeAzUrm1b8yxqLa9LYg0CbXEEQLxO7PiitmYWn8boCpt05YNFQVp+a2YWX8gHlD X-Received: by 10.99.6.198 with SMTP id 189mr24518023pgg.131.1523248161530; Sun, 08 Apr 2018 21:29:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523248161; cv=none; d=google.com; s=arc-20160816; b=PfWdJsLgADel0V99BVh0tgr4aacXoMJ0Yo8KIo2NsJjNDQRUfaIvVLQxGdjN5nwA0Q rYVvqEe3eWZcsh2osxeICCjfotzpFW5VXKqZeij2O2q1pwM3ahn2gWI3jAyVfG1ld7mn 6QTDf1JjmlV0MzOg7UFpoTYIDMsxV78tNa52fBYRyVYXePY6P05w0TmmWWsnSPbcCMuF iopCrWcpbL41RQDfHdz8wYtxQAOyvFf8sid7sB3OUv8IAR8fJhpZvk70Ycq8rDqevrsl mDPfVlbVmv8n70CEv3AMNBe5suuCKBBx3nXqTtnXbgLHUZR/yuszRZ1gNyEUFEHNPy1I ouPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature :arc-authentication-results; bh=n8Aa8mr8FuaR3PQ4F/PVC9/Oayv54q99vdUbTfAdVWs=; b=yVbw3PTh8dbd5INIeptrnqdt/Hg3tSWOhi/dBKDJw6PIkqz+uZ9h7x9Yks9y+3C4YT UVAWmtiNgF3YiMYI985+FzNUfX2LNMsb39PGiCEr41kDUhcbkRYX6bI9j9mJuShKkKd3 lHk8T0F9g+tWb66Col6osj019unMf30BIlfmoaK9W74aFdyKwQlVauRVMbad7rUtRjlN FPTYBM5kSATD5perBSwW80RfRQlalmi1P3285abSrMFGofcYRH/9HcW4XbR7iAwwu6lS aCbUY8zAc0PXaEjOSpSIYPT+tMxyUd99crP8hHu8RApbzbvfeqlmZCOWLWhMj6RQbKxF HxYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Z1n9adPv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i73si10496650pgc.171.2018.04.08.21.28.43; Sun, 08 Apr 2018 21:29:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Z1n9adPv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752100AbeDIEXj (ORCPT + 99 others); Mon, 9 Apr 2018 00:23:39 -0400 Received: from ozlabs.org ([103.22.144.67]:53743 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751581AbeDIEXh (ORCPT ); Mon, 9 Apr 2018 00:23:37 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 40KHHC2cj0z9s1X; Mon, 9 Apr 2018 14:23:34 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1523247815; bh=n8Aa8mr8FuaR3PQ4F/PVC9/Oayv54q99vdUbTfAdVWs=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Z1n9adPvLXk2HH9CuKGMlavqj+Q6L+FkyPpnnGexOm0SitQ/DqfJRqU++97v2tm2k 2syQhBmDRvjK9Vcc7l1+zbPRgUh9ToZsdYPEIq7yqfxsrCLmwPeDMb9D944wzP4Vv/ VFOLfNy5eH7alunHG0gaOOkwbK+RavCLS1eafiPO2j64UU0BDI4YOgxoXbV3Tjo3kE EEx4USoRUGS2eyBghYTJGR8qg76thBgvMqDBB13lNuGJeH1g7mdtAPMRrlavmC2tdX QxMh1RWVqL6RnonmA++AvkovTIbLgP2ocGHcDjEgRfqLNW90zPFIig3NN0jDzfUata /4QfAuaaIW1xg== Date: Mon, 9 Apr 2018 14:22:37 +1000 From: Stephen Rothwell To: James Morris Cc: David Howells , "Martin K. Petersen" , Linux-Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the scsi-mkp tree with the efi-lock-down tree Message-ID: <20180409142237.66d3466d@canb.auug.org.au> In-Reply-To: References: <20180315183412.01412755@canb.auug.org.au> <20180406092216.4579a70c@canb.auug.org.au> <20180409115831.46a351ef@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/9LDqH2mx.AKXO25C+_U5Mvw"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/9LDqH2mx.AKXO25C+_U5Mvw Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi James, On Mon, 9 Apr 2018 12:51:53 +1000 (AEST) James Morris w= rote: > > That's odd, my next-general branch is merged to Linus. The security tree in linux-next is git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#ne= xt-testing which has the efi-lock-down tree merged into it. --=20 Cheers, Stephen Rothwell --Sig_/9LDqH2mx.AKXO25C+_U5Mvw Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlrK6o0ACgkQAVBC80lX 0Gxongf/TjiC0Jrsie0haBTFa4kYo1QJDRv61VnyLH6qI8L0SX8UhViz7YX//9Pt hXErIp7UjR/fNNen1Jw2+5Ho/u77jWw3gfgW5jDu8y7CoU6ForkjJ/H36gsliORp 093iqo/VNVUS3l9+fTfGfcbFsdOTMffkLXN77fHaj7OmIfXV+L5nJOp32Daa4EH6 8QlUPjcVfHpMWlSNG8iQzF8vr6OPopcYswTOtNAePW2ZZ/FGTf6oQv48AKD+f2im YFaqzEjV2Qw1gWW6ZzYb6U+ga+/ji8CIJXPPDuZb4iFvTkgtcShV4LbvuXQhUM+T tdctfIF7TKP4im/Xlgf56LYNyQxwZw== =QUye -----END PGP SIGNATURE----- --Sig_/9LDqH2mx.AKXO25C+_U5Mvw--