diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-12-19 15:27:21 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-12-19 15:27:21 +0100 |
| commit | 5a213b9220e0bf4c924412d83d7c9a90acb553e8 (patch) | |
| tree | 812347f305cf082e8892ac34eedf51a4979c5636 /mm/balloon_compaction.c | |
| parent | d8f6ef45a623d650f9b97e11553adb4978f6aa70 (diff) | |
| parent | 63fa47ba886b86cbd58f03b3b01b04bd57a1f233 (diff) | |
| download | linux-5a213b9220e0bf4c924412d83d7c9a90acb553e8.tar.bz2 | |
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 'mm/balloon_compaction.c')
0 files changed, 0 insertions, 0 deletions