[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <Yzq/hvPKqiCF+QkH@gmail.com>
Date: Mon, 3 Oct 2022 12:55:02 +0200
From: Ingo Molnar <mingo@...nel.org>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: linux-kernel@...r.kernel.org,
Peter Zijlstra <peterz@...radead.org>,
Arnaldo Carvalho de Melo <acme@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Jiri Olsa <jolsa@...nel.org>,
Namhyung Kim <namhyung@...nel.org>
Subject: Re: [GIT PULL] perf fixes
* Linus Torvalds <torvalds@...ux-foundation.org> wrote:
> On Sun, Oct 2, 2022 at 3:56 AM Ingo Molnar <mingo@...nel.org> 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
e758bebe3046ef6a51d19d7b5498e165dc8e37be -
thule:~/tip> git log -1 -p 87693645ae89 | grep -A 100 "^@@" | tail +2 | sha1sum
e758bebe3046ef6a51d19d7b5498e165dc8e37be -
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!
Thanks,
Ingo
Powered by blists - more mailing lists