* [GIT PULL] KVM changes for Linux 6.3-rc7
@ 2023-04-10 15:39 Paolo Bonzini
2023-04-10 21:05 ` Linus Torvalds
2023-04-11 18:52 ` pr-tracker-bot
0 siblings, 2 replies; 5+ messages in thread
From: Paolo Bonzini @ 2023-04-10 15:39 UTC (permalink / raw
To: torvalds; +Cc: linux-kernel, kvm, oliver.upton
Linus,
The following changes since commit fb5015bc8b733323b58f015b88e4f316010ec856:
docs: kvm: x86: Fix broken field list (2023-04-04 13:22:05 -0400)
are available in the Git repository at:
https://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/for-linus
for you to fetch changes up to 0bf9601f8ef0703523018e975d6c1f3fdfcff4b9:
Merge tag 'kvmarm-fixes-6.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD (2023-04-06 13:34:19 -0400)
----------------------------------------------------------------
Two ARM fixes:
* Ensure the guest PMU context is restored before the first KVM_RUN,
fixing an issue where EL0 event counting is broken after vCPU
save/restore
* Actually initialize ID_AA64PFR0_EL1.{CSV2,CSV3} based on the
sanitized, system-wide values for protected VMs
----------------------------------------------------------------
Fuad Tabba (1):
KVM: arm64: Advertise ID_AA64PFR0_EL1.CSV2/3 to protected VMs
Paolo Bonzini (1):
Merge tag 'kvmarm-fixes-6.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
Reiji Watanabe (1):
KVM: arm64: PMU: Restore the guest's EL0 event counting after migration
arch/arm64/kvm/arm.c | 26 +++++++++++++++++++++++++-
arch/arm64/kvm/hyp/include/nvhe/fixed_config.h | 5 ++++-
arch/arm64/kvm/hyp/nvhe/sys_regs.c | 7 -------
arch/arm64/kvm/pmu-emul.c | 1 +
arch/arm64/kvm/sys_regs.c | 1 -
5 files changed, 30 insertions(+), 10 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] KVM changes for Linux 6.3-rc7
2023-04-10 15:39 [GIT PULL] KVM changes for Linux 6.3-rc7 Paolo Bonzini
@ 2023-04-10 21:05 ` Linus Torvalds
2023-04-11 6:34 ` Paolo Bonzini
2023-04-11 18:52 ` pr-tracker-bot
1 sibling, 1 reply; 5+ messages in thread
From: Linus Torvalds @ 2023-04-10 21:05 UTC (permalink / raw
To: Paolo Bonzini; +Cc: linux-kernel, kvm, oliver.upton
On Mon, Apr 10, 2023 at 8:39 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> https://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/for-linus
>
> for you to fetch changes up to 0bf9601f8ef0703523018e975d6c1f3fdfcff4b9:
>
> Merge tag 'kvmarm-fixes-6.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD (2023-04-06 13:34:19 -0400)
Nope, not at all.
You seem to have tagged the wrong commit. Instead of pointing to that
"kvmarm fixes" thing, it points to something entirely different.
Please double-check what happened.
Linus
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] KVM changes for Linux 6.3-rc7
2023-04-10 21:05 ` Linus Torvalds
@ 2023-04-11 6:34 ` Paolo Bonzini
2023-04-11 16:45 ` Linus Torvalds
0 siblings, 1 reply; 5+ messages in thread
From: Paolo Bonzini @ 2023-04-11 6:34 UTC (permalink / raw
To: Linus Torvalds, linux-kernel, KVM list,
'oliver.upton@linux.dev'
On 4/10/23 23:05, Linus Torvalds wrote:
> On Mon, Apr 10, 2023 at 8:39 AM Paolo Bonzini<pbonzini@redhat.com> wrote:
>> https://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/for-linus
>>
>> for you to fetch changes up to 0bf9601f8ef0703523018e975d6c1f3fdfcff4b9:
>>
>> Merge tag 'kvmarm-fixes-6.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD (2023-04-06 13:34:19 -0400)
> Nope, not at all.
>
> You seem to have tagged the wrong commit. Instead of pointing to that
> "kvmarm fixes" thing, it points to something entirely different.
>
> Please double-check what happened.
That's the current 6.4 head, so the most likely explanation is that I
incorrectly ran "git tag ... -F<absolute path> && git push kvm
+tags/for-linus" again from the wrong window/worktree. That must have
been while I was doing a final check of the pull request, between
preparing the message and sending it; probably something stupid like
pressing "Enter" instead of "Ctrl-c" after a command line search (for
example, I typically use Ctrl-r to do the final send without --dry-run).
I've now pushed the correct tag (object hash 7088282073b8).
Out of curiosity, do you have some kind of script that parses the "git
request-pull" messages and does these checks? Or was it just the
mismatch between diffstat and tag message?
Paolo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] KVM changes for Linux 6.3-rc7
2023-04-11 6:34 ` Paolo Bonzini
@ 2023-04-11 16:45 ` Linus Torvalds
0 siblings, 0 replies; 5+ messages in thread
From: Linus Torvalds @ 2023-04-11 16:45 UTC (permalink / raw
To: Paolo Bonzini; +Cc: linux-kernel, KVM list, oliver.upton@linux.dev
On Mon, Apr 10, 2023 at 11:34 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> Out of curiosity, do you have some kind of script that parses the "git
> request-pull" messages and does these checks? Or was it just the
> mismatch between diffstat and tag message?
For me, it's manual - I check that the diffstat matches, but also
check that the description matches the shortlog I get.
And if anything looks weird, I dig deeper (the diffstat often doesn't
match - some people use "--patience" for the diff which can generate
small differences, or there are other changes nearby so that the
merged end result diffs differently from the pre-merge state etc etc).
But "git request-pull" should actually have warned you about the SHA's
not matching. When it generates that
"are available in the Git repository at:
https://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/for-linus
for you to fetch changes up to 0bf9601f8ef0703523018e975d6c1f3fdfcff4b9:"
verbiage, it should actually have verified that the tag matches
locally, and it generates that commit ID and the shortlog from the
local tag.
And the fact that the shortlog (and commit ID) you had was the
expected one, but the tag pointed to something else makes me suspect
that you are mis-using "git request-pull".
I strongly suspect that you did the request-pull *without* pointing at
the tag (in fact, you cannot possibly have pointed at the correct tag,
since the request-pull contents did *not* match the tag contents), and
then fixed things up manually later when you created the tag.
So you must have explicitly avoided all the automation that "git
request-pull" does.
Linus
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] KVM changes for Linux 6.3-rc7
2023-04-10 15:39 [GIT PULL] KVM changes for Linux 6.3-rc7 Paolo Bonzini
2023-04-10 21:05 ` Linus Torvalds
@ 2023-04-11 18:52 ` pr-tracker-bot
1 sibling, 0 replies; 5+ messages in thread
From: pr-tracker-bot @ 2023-04-11 18:52 UTC (permalink / raw
To: Paolo Bonzini; +Cc: torvalds, linux-kernel, kvm, oliver.upton
The pull request you sent on Mon, 10 Apr 2023 11:39:17 -0400:
> https://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/aa4c9185f0a16662c25d814c713b3cd0b4f4e97a
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-04-11 18:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-10 15:39 [GIT PULL] KVM changes for Linux 6.3-rc7 Paolo Bonzini
2023-04-10 21:05 ` Linus Torvalds
2023-04-11 6:34 ` Paolo Bonzini
2023-04-11 16:45 ` Linus Torvalds
2023-04-11 18:52 ` pr-tracker-bot
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 read-only IMAP folder(s) and NNTP newsgroup(s).