Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 1 commit into from

Conversation

bjoto
Copy link

@bjoto bjoto commented Apr 3, 2024

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

@bjoto
Copy link
Author

bjoto commented Apr 3, 2024

Upstream branch: 7115ff4
series: https://patchwork.kernel.org/project/linux-riscv/list/?series=840926
version: 5

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-riscv/list/?series=840926
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: drivers/perf: riscv: Fix counter mask iteration for RV32
Patch failed at 0006 drivers/perf: riscv: Fix counter mask iteration for RV32
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: sha1 information is lacking or useless (drivers/perf/riscv_pmu_sbi.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:


@bjoto bjoto closed this Apr 3, 2024
@bjoto bjoto deleted the series/806869=>fixes branch April 3, 2024 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant