From: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
To: Greg KH <greg@kroah.com>, CKI Project <cki-project@redhat.com>
Cc: Linux Stable maillist <stable@vger.kernel.org>
Subject: Re: ❌ FAIL: Stable queue: queue-5.2
Date: Mon, 26 Aug 2019 11:23:58 +0300 [thread overview]
Message-ID: <d0567d4e-6bbe-4a93-d657-0ee7f6e4625d@redhat.com> (raw)
In-Reply-To: <20190825144122.GA27775@kroah.com>
On 8/25/19 5:41 PM, Greg KH wrote:
> On Sun, Aug 25, 2019 at 10:37:26AM -0400, CKI Project wrote:
>> Merge testing
>> -------------
>>
>> We cloned this repository and checked out the following commit:
>>
>> Repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
>> Commit: f7d5b3dc4792 - Linux 5.2.10
>>
>>
>> We grabbed the cc88f4442e50 commit of the stable queue repository.
>>
>> We then merged the patchset with `git am`:
>>
>> keys-trusted-allow-module-init-if-tpm-is-inactive-or-deactivated.patch
>
> That file is not in the repo, I think your system is messed up :(
Sorry for the trouble, Greg, but I think it's a race between the changes to
the two repos.
The job which triggered this message was started right before the moment this
commit was made:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=af2f46e26e770b3aa0bc304a13ecd24763f3b452
At that moment, the repo was still on this commit, about five hours old:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/commit/?id=cc88f4442e505e9f1f21c8c119debe89cbf63ab2
which still had the file. And when the job finished, and the message reached
you, yes, the repo no longer contained it.
At the moment the job started, the latest commit to stable/linux.git
was about 22 minutes old:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.2.y&id=f7d5b3dc4792a5fe0a4d6b8106a8f3eb20c3c24c
and the repo already contained the patches from the queue, including the one
the job tried to merge:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.2.y&id=f820ecf609cc38676071ec6c6d3e96b26c73b747
IIRC, we agreed to not start testing both of the repos until the latest
commits are at least 5 minutes old. In this situation the latest commit was 22
minutes old, so the system started testing.
We could increase the window to, say, 30 minutes (or something else), to avoid
misfires like this, but then the response time would be increased accordingly.
It's your pick :)
Nick
next prev parent reply other threads:[~2019-08-26 8:24 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-25 14:37 ❌ FAIL: Stable queue: queue-5.2 CKI Project
2019-08-25 14:41 ` Greg KH
2019-08-26 8:23 ` Nikolai Kondrashov [this message]
2019-08-26 8:33 ` Greg KH
2019-08-26 9:13 ` Nikolai Kondrashov
2019-08-26 9:40 ` Nikolai Kondrashov
2019-08-26 11:12 ` Nikolai Kondrashov
2019-08-26 11:39 ` Nikolai Kondrashov
2019-08-26 13:33 ` Sasha Levin
2019-08-27 13:10 ` Nikolai Kondrashov
-- strict thread matches above, loose matches on Subject: below --
2019-09-19 12:42 CKI Project
2019-09-19 12:57 ` Greg KH
2019-09-07 11:48 CKI Project
2019-09-04 5:31 CKI Project
2019-09-04 21:40 ` Rachel Sibley
2019-08-30 23:41 CKI Project
2019-08-28 12:36 CKI Project
2019-09-10 8:19 ` Hangbin Liu
2019-09-10 8:58 ` Greg KH
2019-09-10 9:30 ` Hangbin Liu
2019-09-10 9:40 ` Hangbin Liu
2019-09-10 10:52 ` Sasha Levin
2019-08-27 10:54 CKI Project
2019-08-26 22:06 CKI Project
2019-08-27 14:58 ` Rachel Sibley
2019-08-26 20:33 CKI Project
2019-08-26 21:00 ` Major Hayden
2019-08-22 22:48 CKI Project
2019-08-22 23:37 ` Greg KH
2019-08-23 6:57 ` Jan Stancek
2019-08-23 15:38 ` Sasha Levin
2019-08-23 2:19 ` ? " Murphy Zhou
2019-08-18 21:09 ❌ " CKI Project
2019-08-18 14:27 CKI Project
2019-08-18 14:05 CKI Project
2019-08-18 14:20 ` Greg KH
2019-08-18 12:00 CKI Project
2019-08-18 16:59 ` Ondrej Mosnacek
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=d0567d4e-6bbe-4a93-d657-0ee7f6e4625d@redhat.com \
--to=nikolai.kondrashov@redhat.com \
--cc=cki-project@redhat.com \
--cc=greg@kroah.com \
--cc=stable@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).