Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
Commit 5a213b92 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'topic/ppc-kvm' of... 

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 511d25d6 ("KVM:
PPC: Book3S: Suppress warnings when allocating too big memory slots")
from the powerpc tree.
parents d8f6ef45 63fa47ba
Branches
Tags
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 668 additions and 492 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Open hardware computers for makers, educators and professionals