From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753910AbaHEMGT (ORCPT ); Tue, 5 Aug 2014 08:06:19 -0400 Received: from ozlabs.org ([103.22.144.67]:38911 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752884AbaHEMGQ (ORCPT ); Tue, 5 Aug 2014 08:06:16 -0400 Date: Tue, 5 Aug 2014 22:06:08 +1000 From: Stephen Rothwell To: Paolo Bonzini Cc: James Hogan , Alexander Graf , Marcelo Tosatti , Gleb Natapov , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alexey Kardashevskiy Subject: Re: linux-next: manual merge of the kvm-ppc tree with the kvm tree Message-ID: <20140805220608.427fc0d2@canb.auug.org.au> In-Reply-To: <53E0C27B.1020503@redhat.com> References: <20140804180403.3cfdbadf@canb.auug.org.au> <53E0AB44.90804@imgtec.com> <20140805201342.6b8a8ca4@canb.auug.org.au> <53E0C27B.1020503@redhat.com> X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.24; i486-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/AO963ujzf2Q.5tQaCTw+AqJ"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/AO963ujzf2Q.5tQaCTw+AqJ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Paolo, On Tue, 05 Aug 2014 13:39:39 +0200 Paolo Bonzini wrot= e: > > Il 05/08/2014 12:13, Stephen Rothwell ha scritto: > >> > And I suppose it'd be nice to replace tabs with spaces for consisten= cy > >> > (since that's one of the things bf5590f37919 did). > >> >=20 > >> > How about this fixup patch? > > Thanks for that I have applied it to my merge resolution. >=20 > 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. Excellent, thanks --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/AO963ujzf2Q.5tQaCTw+AqJ Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJT4Mi1AAoJEMDTa8Ir7ZwVLoEP/Rt4RdUmwJYXPGtvXMNkMEhK Xy4ORV/OVdk63cckl2R2wC5f+4NeIbZ+5z6KcjE96k9+NSE5cFow6JYINW/OgMKy uO2tTMH41yYDMlx4+EhI0AjTINomF8p0F7wlQ0Ed/mrfPTlzDFbdUqXWLsMifCqC 1Gp1VcdyBRj2f/W4Ue6D+nipeBb6RUqgNENDsKGqCFweNFfRD1tTclBBJ0MTJnop bwrMD2mxWsGXXvCN0NlmZFEo/mFYRjzkAQDStAkZS+6dmzmLlmKmv6lEpdwYKyPe Z8NC2qLfzHPmHsZfvUbvT1MZKjLCTB3oBVovPLlSqDcc25LorF17WS+8kJx+4Euv Gx7G5m3XFc0ImrfOcUMKtmkSaY3D8S3Bu8X8MiG06EMylXFRi6BLnm0viuPRCQRE wdHTYG+u17TiF9WcXBZVPohAbZqhC7w0IWTaNjSmSf58uX3Y+j9jt3/FSprvUX0X CU+6ySWutVTu7YqpmO1P0bv0bcG97LSBG7ksXX5L+Gprx6SZs5TNL5TW1EMEo5n7 3MhCljdeATxNjXcniveAIDs5vV3ZMZCX3MT7zbbxPK82ew+ExY6UOXKEKW9+JJBc EKPdMbDu+eWsVM59VJWKTvdO0G+vFXZk0yVXW8uFQCq+tPTLzD5TM6xkyDu6iYH5 5Ti5yEDKrcr3CjzPIhm+ =5+zt -----END PGP SIGNATURE----- --Sig_/AO963ujzf2Q.5tQaCTw+AqJ--