Re: linux-next: manual merge of the kvm-ppc tree with the kvm tree

[James Hogan]

Hi Stephen,

On 04/08/14 09:04, Stephen Rothwell wrote:
>  +  PPC   | KVM_REG_PPC_LPCR              | 64

I think due to a0840240c0c6 this one should be s/64/32/.

> ++  PPC   | KVM_REG_PPC_LPCR_64		| 64

And I suppose it'd be nice to replace tabs with spaces for consistency
(since that's one of the things bf5590f37919 did).

How about this fixup patch?

Cheers
James

diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index dc226e1867e1..2863f02b0efb 100644
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@ -1895,8 +1895,8 @@ registers, find a list below:
   PPC   | KVM_REG_PPC_PID               | 64
   PPC   | KVM_REG_PPC_ACOP              | 64
   PPC   | KVM_REG_PPC_VRSAVE            | 32
-  PPC   | KVM_REG_PPC_LPCR              | 64
-  PPC   | KVM_REG_PPC_LPCR_64		| 64
+  PPC   | KVM_REG_PPC_LPCR              | 32
+  PPC   | KVM_REG_PPC_LPCR_64           | 64
   PPC   | KVM_REG_PPC_PPR               | 64
   PPC   | KVM_REG_PPC_ARCH_COMPAT       | 32
   PPC   | KVM_REG_PPC_DABRX             | 32
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/