All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	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,
	Alexey Kardashevskiy <aik@ozlabs.ru>
Subject: Re: linux-next: manual merge of the kvm-ppc tree with the kvm tree
Date: Tue, 05 Aug 2014 13:39:39 +0200	[thread overview]
Message-ID: <53E0C27B.1020503@redhat.com> (raw)
In-Reply-To: <20140805201342.6b8a8ca4@canb.auug.org.au>

Il 05/08/2014 12:13, Stephen Rothwell ha scritto:
>> > 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.

I've now merged kvm-ppc and kvm-arm into kvm, so everything should be
fixed tomorrow.  All conficts should be gone, and the build failure on
PPC too.

Thanks for your work on linux-next, Stephen.

Paolo

  reply	other threads:[~2014-08-05 11:39 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
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 [this message]
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=53E0C27B.1020503@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=agraf@suse.de \
    --cc=aik@ozlabs.ru \
    --cc=gleb@kernel.org \
    --cc=james.hogan@imgtec.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mtosatti@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.