Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp4441567ybe; Mon, 16 Sep 2019 12:15:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqw1P0A1w74v6HjkKx84q2uFj1V7xiBjp3q7E6aIPlEvEgliluHi+5CA2lfeq9qXybhJDCoF X-Received: by 2002:a50:baab:: with SMTP id x40mr937518ede.60.1568661321734; Mon, 16 Sep 2019 12:15:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568661321; cv=none; d=google.com; s=arc-20160816; b=y936nR/c2LgB2czbhZQP7kEXZx3qC5nZUq/Evg+PDxZFwEG7yiV3GQL2i3Nq+86vfs 5S/C3p/wU05C+KuEZi6GV31wSfpxxQoiVaKaoGFANQfSbMQ/EdMlAHEpS2QV3gqaD5X5 96wDKV1lEJHCgGtPU4p8+ivF5ue9wU5b/HEOG+5VJccQTQ6BF3VWGkvBAIxa58Saoxmi HAhDQaeFo2yJJzicESvoxVrTB5KL3hwcx7aFSiYzGIUggsG//4pidaSL8LLxxEzyrWih p6aMTloBW9yyHxkz75brepdbEv4I/TvijElbQO4VY3tP1NsI99jSQdkqqRSAHR/RKyxQ 3bzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=IhSYkleqI3JelFkIKmOLyDJ/rhb1T44sCZeTh4GOur0=; b=S0Ojl4X9wbh+D08fqpuJJBcavrLYsVo+N4uaPWIZYN5tZQDfHAjsgux94t8wq465JF +/10t5CqILgnoaTcW6cEB7vxEBxyA1YoCWbaVOhJPkJ1674Tpk1yzhndzA54wyyJE1Oq 7kRI2qVfe8be3YS3mr4vA5pf6uaypp50cxZ4acydjNgHkk7C7uiIKbqTm6gkSRjbnjvA mmz5UVcK3nqTb0SgNK+SBfIIQBvA5Qa3/rGqDycTdiBZGLVOI8D98tbEaRc0Uglo7nBa 8LvM70HluBVw6qtvocnTRaw44mu/uRzoKOEV7j1vPVKLEKwMqvitTtA2JSYb3uH5wM4X RSyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=PfwKJr4T; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a23si1448edj.201.2019.09.16.12.14.57; Mon, 16 Sep 2019 12:15: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=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=PfwKJr4T; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387674AbfIPNmK (ORCPT + 99 others); Mon, 16 Sep 2019 09:42:10 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:53238 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733054AbfIPNmK (ORCPT ); Mon, 16 Sep 2019 09:42:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=IhSYkleqI3JelFkIKmOLyDJ/rhb1T44sCZeTh4GOur0=; b=PfwKJr4TkGavs+jIV2Jgj/gIM eK9Ws2URbDzqZisVOhvBDpQri9UXhfIkby2tyCHeDNYevg+xRGlvNZ2Vfc/8iYgwYX5bcmgBwyiNd e7YhAYOxLULgDOSHlDg3fK5KHVrZiy0ooz07jF63eb0caakUKaWTNJ0dlTXsJ1Bg8/GYs=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=ypsilon.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1i9rGW-0004bj-7j; Mon, 16 Sep 2019 13:42:04 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id BC1382741A0D; Mon, 16 Sep 2019 14:42:03 +0100 (BST) Date: Mon, 16 Sep 2019 14:42:03 +0100 From: Mark Brown To: Anders Roxell Cc: Shuah Khan , Jarkko Sakkinen , Petr Vorel , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the kselftest tree with the tpmdd tree Message-ID: <20190916134203.GG4352@sirena.co.uk> References: <20190916014535.GU4352@sirena.co.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="HbTzC+AcCowV2D6d" Content-Disposition: inline In-Reply-To: X-Cookie: Man and wife make one fool. User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --HbTzC+AcCowV2D6d Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Sep 16, 2019 at 03:16:54PM +0200, Anders Roxell wrote: > If I re-read the Documentation/dev-tools/kselftest.rst > I think the patch from the kselftest tree should be dropped. > I saw that I didn't send an email to the tpm maintainers or the tpm > list when I sent the > patch, I'm sorry. If the change is fine that might be more trouble than it's worth, it's a trivial add/add conflict. Up to those concerned though. --HbTzC+AcCowV2D6d Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl1/kSoACgkQJNaLcl1U h9B42Af9FCeFLU3AJ1eD9eMVeqJVdwEFFP6AMPXnrfkLGRi36tX7E4nEagJBDFOk fahF8r2zcT2wSU5xo8ROJJw5EhJr8Wh4DNgMWj+BqSSOi5mBTEG4AKe/MkhysJyN 6WowFdahrSXF6FxnBgoCsInDEhpnvMo6Nf6QbB82itwoAEUFAld6x2U4d2JG4JUr Ah60Yszt+tniC4OOqs9BzBHYRTb+HyKqK+INJSvrEUBlJC0VBcBC0chdces5e32n gC5fDqUOc+n6sXyakTUtDoUmeHV82C3HZYK+X9HiTHoyljvbBhxZMkE6igj40nZx 9bV0rHfHCQG8ZdeN8T/1tvLjLHsW0Q== =RS2A -----END PGP SIGNATURE----- --HbTzC+AcCowV2D6d--