RISC-V SBI v2.0 PMU improvements and Perf sampling in KVM guest

[bjoto]

Pull request for series with
subject: RISC-V SBI v2.0 PMU improvements and Perf sampling in KVM guest
version: 7
url: https://patchwork.kernel.org/project/linux-riscv/list/?series=845163

[bjoto]

Upstream branch: a373a36
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=845163
version: 7

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-riscv/list/?series=845163
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -s --3way
  stdout: 'Applying: RISC-V: Fix the typo in Scountovf CSR name
Applying: RISC-V: Add FIRMWARE_READ_HI definition
Applying: drivers/perf: riscv: Read upper bits of a firmware counter
Applying: drivers/perf: riscv: Use BIT macro for shifting operations
Applying: RISC-V: Add SBI PMU snapshot definitions
Applying: RISC-V: KVM: Rename the SBI_STA_SHMEM_DISABLE to a generic name
Applying: RISC-V: Use the minor version mask while computing sbi version
Applying: drivers/perf: riscv: Implement SBI PMU snapshot function
Applying: drivers/perf: riscv: Fix counter mask iteration for RV32
Applying: RISC-V: KVM: Fix the initial sample period value
Applying: RISC-V: KVM: No need to update the counter value during reset
Applying: RISC-V: KVM: No need to exit to the user space if perf event failed
Applying: RISC-V: KVM: Implement SBI PMU Snapshot feature
Applying: RISC-V: KVM: Add perf sampling support for guests
Applying: RISC-V: KVM: Support 64 bit firmware counters on RV32
Applying: RISC-V: KVM: Improve firmware counter read function
Applying: KVM: riscv: selftests: Move sbi definitions to its own header file
Applying: KVM: riscv: selftests: Add helper functions for extension checks
Applying: KVM: riscv: selftests: Add Sscofpmf to get-reg-list test
Applying: KVM: riscv: selftests: Add SBI PMU extension definitions
Applying: KVM: riscv: selftests: Add a test for PMU snapshot functionality
Using index info to reconstruct a base tree...
A	tools/testing/selftests/kvm/riscv/sbi_pmu_test.c
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): tools/testing/selftests/kvm/riscv/sbi_pmu_test.c deleted in HEAD and modified in KVM: riscv: selftests: Add a test for PMU snapshot functionality. Version KVM: riscv: selftests: Add a test for PMU snapshot functionality of tools/testing/selftests/kvm/riscv/sbi_pmu_test.c left in tree.
Patch failed at 0021 KVM: riscv: selftests: Add a test for PMU snapshot functionality
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

* Unmerged path tools/testing/selftests/kvm/riscv/sbi_pmu_test.c