From: Stephen Rothwell <sfr@canb•auug.org.au>
To: James Hogan <james.hogan@imgtec•com>
Cc: Alexander Graf <agraf@suse•de>,
Marcelo Tosatti <mtosatti@redhat•com>,
Gleb Natapov <gleb@kernel•org>,
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 20:13:42 +1000 [thread overview]
Message-ID: <20140805201342.6b8a8ca4@canb.auug.org.au> (raw)
In-Reply-To: <53E0AB44.90804@imgtec.com>
[-- Attachment #1: Type: text/plain, Size: 606 bytes --]
Hi James,
On Tue, 5 Aug 2014 11:00:36 +0100 James Hogan <james.hogan@imgtec•com> wrote:
>
> 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?
Thanks for that I have applied it to my merge resolution.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-08-05 10:13 UTC|newest]
Thread overview: 10+ 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
2014-08-05 10:13 ` Stephen Rothwell [this message]
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-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=20140805201342.6b8a8ca4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agraf@suse$(echo .)de \
--cc=aik@ozlabs$(echo .)ru \
--cc=gleb@kernel$(echo .)org \
--cc=james.hogan@imgtec$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mtosatti@redhat$(echo .)com \
--cc=pbonzini@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox