On Thu, Nov 21, 2024 at 11:49 PM Paolo Bonzini <pbonzini@xxxxxxxxxx> wrote: > > On 11/21/24 15:34, Sasha Levin wrote: > > On Thu, Nov 21, 2024 at 03:07:03PM +0100, Paolo Bonzini wrote: > >> On 11/21/24 14:26, Nathan Chancellor wrote: > >>> On Thu, Nov 21, 2024 at 07:56:23AM -0500, Sasha Levin wrote: > >>>> Hi Paolo, > >>>> > >>>> On Wed, Nov 20, 2024 at 08:58:42AM -0500, Paolo Bonzini wrote: > >>>>> riscv: perf: add guest vs host distinction > >>>> > >>>> When merging this PR into linus-next, I've started seeing build errors: > >>>> > >>>> Looks like this is due to 2c47e7a74f44 ("perf/core: Correct perf > >>>> sampling with guest VMs") which went in couple of days ago through > >>>> Ingo's perf tree and changed the number of parameters for > >>>> perf_misc_flags(). > >> > >> Thanks Sasha. :( Looks like Stephen does not build for risc-v. > > > > He does :) > > > > This issue was reported[1] about a week ago in linux-next > > Yeah, that's Linaro not Stephen. > > > and a fix was > > sent out (the one you linked to be used for conflict resolution), but it > > looks like it wasn't picked up by either the perf tree or the KVM tree. > > Yeah, that's not surprising. :( Neither KVM nor I weren't CC'd on > either the report or the bugfix; and the perf tree didn't have the code > at all as Ingo pointed out > (https://lore.kernel.org/all/ZzxDvLKGz1ouWzgX@xxxxxxxxx/). Anup was > CC'd on the bugfix but he must have missed too and didn't notify me. > Sorry, I totally missed this one. I generally rely on linux-next to report cross-tree conflicts or issues but this one was somehow not reported. Let me know if you need any action from my side. Regards, Anup