Automatic merge of 'topic/ppc-kvm' into merge-test (2023-10-18 22:44)

Conflicts: arch/powerpc/include/asm/kvm_ppc.h
linuxppc · Oct 18, 2023 · a06984e · a06984e
2 parents 4479862 + 4766522
commit a06984e
Show file tree

Hide file tree

Showing 31 changed files with 4,670 additions and 263 deletions.
diff --git a/Documentation/powerpc/index.rst b/Documentation/powerpc/index.rst
@@ -26,6 +26,7 @@ powerpc
     isa-versions
     kaslr-booke32
     mpc52xx
+    kvm-nested
     papr_hcalls
     pci_iov_resource_on_powernv
     pmu-ebb