From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Mark Brown <broonie@kernel.org>, Hamza Attak <hamza@hpe.com>,
James Morris <james.l.morris@oracle.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tpmdd tree with Linus' tree
Date: Fri, 13 Oct 2017 23:15:12 +0300 [thread overview]
Message-ID: <1507925712.29065.0.camel@linux.intel.com> (raw)
In-Reply-To: <20171011150107.vft64nx3kccndjlj@sirena.co.uk>
On Wed, 2017-10-11 at 16:01 +0100, Mark Brown wrote:
> Hi Jarkko,
>
> Today's linux-next merge of the tpmdd tree got a conflict in:
>
> drivers/char/tpm/tpm2-cmd.c
>
> between commit:
>
> 9f3fc7bcddcb51 ("tpm: replace msleep() with usleep_range() in TPM 1.2/2.0 generic drivers")
>
> from Linus' tree and commit:
>
> 217d4dfa87415e ("tpm: Use dynamic delay to wait for TPM 2.0 self test result")
>
> from the tpmdd tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc drivers/char/tpm/tpm2-cmd.c
> index e1a41b788f08,f40d20671a78..000000000000
> --- a/drivers/char/tpm/tpm2-cmd.c
> +++ b/drivers/char/tpm/tpm2-cmd.c
> @@@ -900,6 -867,10 +867,11 @@@ static int tpm2_do_selftest(struct tpm_
> break;
>
> tpm_msleep(delay_msec);
> ++
> + duration -= delay_msec;
> +
> + /* wait longer the next round */
> + delay_msec *= 2;
> }
>
> return rc;
I guess this is related to that I missed the email from James to LSM that
the branch that I should follow was updated. Apologies.
/Jarkko
next prev parent reply other threads:[~2017-10-13 20:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 15:01 linux-next: manual merge of the tpmdd tree with Linus' tree Mark Brown
2017-10-13 20:15 ` Jarkko Sakkinen [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-05 0:55 Stephen Rothwell
2021-04-23 2:39 Stephen Rothwell
2021-04-23 5:16 ` James Bottomley
2021-04-23 5:22 ` Stephen Rothwell
2017-12-08 2:25 Stephen Rothwell
2017-12-08 10:46 ` Jarkko Sakkinen
2016-06-20 3:13 Stephen Rothwell
2016-06-20 14:33 ` 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=1507925712.29065.0.camel@linux.intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=broonie@kernel.org \
--cc=hamza@hpe.com \
--cc=james.l.morris@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).