Re: [GIT PULL] perf fixes
From: Ingo Molnar
Date: Mon Oct 03 2022 - 06:55:18 EST
* Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
> On Sun, Oct 2, 2022 at 3:56 AM Ingo Molnar <mingo@xxxxxxxxxx> wrote:
> > - Fix KVM guest PEBS register handling.
> I wondered why my diffstat wasn't the same as yours, but it turns out
> it's because I got this one from the kvm tree earlier.
Oh - indeed, didn't notice that.
> It all merged fine, just surprising.
Yeah. These are the two commits:
[perf/urgent] f2aeea57504c ("perf/x86/core: Completely disable guest PEBS via guest's global_ctrl")
[KVM tree] 87693645ae89 ("perf/x86/core: Completely disable guest PEBS via guest's global_ctrl")
Just to make sure I double checked that they are identical:
thule:~/tip> git log -1 -p f2aeea57504c | grep -A 100 "^@@" | tail +2 | sha1sum
thule:~/tip> git log -1 -p 87693645ae89 | grep -A 100 "^@@" | tail +2 | sha1sum
Paolo applied the fix a couple of hours after Peter, but we
never noticed the overlap & the perf/urgent base didn't have
Paolo's commit so I didn't notice when sending the tree.
Sorry about that!