diff options
author | 2021-12-19 15:27:21 +0100 | |
---|---|---|
committer | 2021-12-19 15:27:21 +0100 | |
commit | 5a213b9220e0bf4c924412d83d7c9a90acb553e8 (patch) | |
tree | 812347f305cf082e8892ac34eedf51a4979c5636 /tools/perf/scripts/python/failed-syscalls-by-pid.py | |
parent | KVM: arm64: Use Makefile.kvm for common files (diff) | |
parent | KVM: PPC: Book3S HV P9: Use kvm_arch_vcpu_get_wait() to get rcuwait object (diff) | |
download | linux-dev-5a213b9220e0bf4c924412d83d7c9a90acb553e8.tar.xz linux-dev-5a213b9220e0bf4c924412d83d7c9a90acb553e8.zip |
Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux into HEAD
Fix conflicts between memslot overhaul and commit 511d25d6b789f ("KVM:
PPC: Book3S: Suppress warnings when allocating too big memory slots")
from the powerpc tree.
Diffstat (limited to 'tools/perf/scripts/python/failed-syscalls-by-pid.py')
0 files changed, 0 insertions, 0 deletions