From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-integrity-owner@vger.kernel.org>
Received: from bedivere.hansenpartnership.com ([66.63.167.143]:60468 "EHLO
        bedivere.hansenpartnership.com" rhost-flags-OK-OK-OK-OK)
        by vger.kernel.org with ESMTP id S1751344AbeBTRvx (ORCPT
        <rfc822;linux-integrity@vger.kernel.org>);
        Tue, 20 Feb 2018 12:51:53 -0500
Message-ID: <1519149111.4446.11.camel@HansenPartnership.com>
Subject: Re: [PATCH v3] tpm: fix intermittent failure with self tests
From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
        linux-integrity@vger.kernel.org
Date: Tue, 20 Feb 2018 12:51:51 -0500
In-Reply-To: <1519148635.6941.5.camel@linux.intel.com>
References: <1519043040.4721.5.camel@HansenPartnership.com>
         <1519148635.6941.5.camel@linux.intel.com>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Sender: linux-integrity-owner@vger.kernel.org
List-ID: <linux-integrity.vger.kernel.org>

On Tue, 2018-02-20 at 19:43 +0200, Jarkko Sakkinen wrote:
> I get merge conflicts in my tree but I'll review this.

You told me to rebase it on that patch that wasn't in your tree:

https://patchwork.kernel.org/patch/10208965/

If you put it in your tree, I can just rebase on top of everything.

James