From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38BEBC4CECE for ; Mon, 16 Sep 2019 14:05:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 045B621670 for ; Mon, 16 Sep 2019 14:05:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568642731; bh=pvzXzAzOUN3AfGkTTFGYBzBxwdHiMGRy4EYeWF51Yz4=; h=Subject:To:Cc:References:From:Date:In-Reply-To:List-ID:From; b=AKttTWQXcrgmJzISiALeq4shcfWQ9ur2aNx3rPvvRQbKhf7QePVJL2K+SOM9kRm/l 08T9fLJReKh1ePijIfL0laY6uJxxTkdideP9c6RE4cBD1JM0u2kydQaanAFijkzmPv XoCCwZOCuV9g/o9x2+jCGsZKB999FH/AO4gKiOAg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387505AbfIPOFa (ORCPT ); Mon, 16 Sep 2019 10:05:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:48214 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728169AbfIPOFa (ORCPT ); Mon, 16 Sep 2019 10:05:30 -0400 Received: from [192.168.1.112] (c-24-9-64-241.hsd1.co.comcast.net [24.9.64.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7CD172067D; Mon, 16 Sep 2019 14:05:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568642729; bh=pvzXzAzOUN3AfGkTTFGYBzBxwdHiMGRy4EYeWF51Yz4=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=YmcQ2NLRcrWBYF0hM6OW9vwln79t6I7HtaivS95ykSi1oR+aOj/1Dy9mvyv3eYtaR XfyikylXiNMLPUOLbrC9w1ud0yINyjQmfXSLk5LO5coN4JTVYoafd3MmXSBxzkQoE7 qcRVjipB2XdlSND99Op1irrrAd9Wm28JWSbbV9KI= Subject: Re: linux-next: manual merge of the kselftest tree with the tpmdd tree To: Mark Brown , Anders Roxell Cc: Jarkko Sakkinen , Petr Vorel , Linux Next Mailing List , Linux Kernel Mailing List , shuah References: <20190916014535.GU4352@sirena.co.uk> <20190916134203.GG4352@sirena.co.uk> From: shuah Message-ID: Date: Mon, 16 Sep 2019 08:05:28 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190916134203.GG4352@sirena.co.uk> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On 9/16/19 7:42 AM, Mark Brown wrote: > 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. > I usually handle these with sending a note to Linus in my pull request and request him to pick the one from next. Dropping patch doesn't work very well. No worries I will handle this in my pull request. thanks, -- Shuah