From: shuah <shuah@kernel.org>
To: Mark Brown <broonie@kernel.org>,
Anders Roxell <anders.roxell@linaro.org>
Cc: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
Petr Vorel <pvorel@suse.cz>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
shuah <shuah@kernel.org>
Subject: Re: linux-next: manual merge of the kselftest tree with the tpmdd tree
Date: Mon, 16 Sep 2019 08:05:28 -0600 [thread overview]
Message-ID: <bcade47f-b7cd-9be5-e443-e4eb90da6b3a@kernel.org> (raw)
In-Reply-To: <20190916134203.GG4352@sirena.co.uk>
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
next prev parent reply other threads:[~2019-09-16 14:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 1:45 linux-next: manual merge of the kselftest tree with the tpmdd tree Mark Brown
2019-09-16 13:16 ` Anders Roxell
2019-09-16 13:42 ` Mark Brown
2019-09-16 14:05 ` shuah [this message]
2019-09-16 18:39 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bcade47f-b7cd-9be5-e443-e4eb90da6b3a@kernel.org \
--to=shuah@kernel.org \
--cc=anders.roxell@linaro.org \
--cc=broonie@kernel.org \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pvorel@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).