All of lore.kernel.org
 help / color / mirror / Atom feed
From: James Hogan <james.hogan@imgtec.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Alexander Graf <agraf@suse.de>,
	Marcelo Tosatti <mtosatti@redhat.com>,
	Gleb Natapov <gleb@kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Paolo Bonzini <pbonzini@redhat.com>,
	Alexey Kardashevskiy <aik@ozlabs.ru>
Subject: Re: linux-next: manual merge of the kvm-ppc tree with the kvm tree
Date: Tue, 5 Aug 2014 11:00:36 +0100	[thread overview]
Message-ID: <53E0AB44.90804@imgtec.com> (raw)
In-Reply-To: <20140804180403.3cfdbadf@canb.auug.org.au>

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

WARNING: multiple messages have this Message-ID (diff)
From: James Hogan <james.hogan@imgtec.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Alexander Graf <agraf@suse.de>,
	Marcelo Tosatti <mtosatti@redhat.com>,
	Gleb Natapov <gleb@kernel.org>
Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	Alexey Kardashevskiy <aik@ozlabs.ru>
Subject: Re: linux-next: manual merge of the kvm-ppc tree with the kvm tree
Date: Tue, 5 Aug 2014 11:00:36 +0100	[thread overview]
Message-ID: <53E0AB44.90804@imgtec.com> (raw)
In-Reply-To: <20140804180403.3cfdbadf@canb.auug.org.au>

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

  reply	other threads:[~2014-08-05 10:00 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-04  8:04 linux-next: manual merge of the kvm-ppc tree with the kvm tree Stephen Rothwell
2014-08-05 10:00 ` James Hogan [this message]
2014-08-05 10:00   ` James Hogan
2014-08-05 10:13   ` Stephen Rothwell
2014-08-05 10:13     ` Stephen Rothwell
2014-08-05 11:39     ` Paolo Bonzini
2014-08-05 12:06       ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2017-04-07  4:06 Stephen Rothwell
2014-07-28  6:53 Stephen Rothwell
2012-10-12  2:12 Stephen Rothwell
2012-10-12  2:12 ` Stephen Rothwell
2012-10-12  2:12 ` Stephen Rothwell
2012-09-04  5:04 Stephen Rothwell
2012-05-21  5:21 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=53E0AB44.90804@imgtec.com \
    --to=james.hogan@imgtec.com \
    --cc=agraf@suse.de \
    --cc=aik@ozlabs.ru \
    --cc=gleb@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mtosatti@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.