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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <53E0C27B.1020503@redhat.com>
Date:	Tue, 05 Aug 2014 13:39:39 +0200
From:	Paolo Bonzini <pbonzini@...hat.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	James Hogan <james.hogan@...tec.com>
CC:	Alexander Graf <agraf@...e.de>,
	Marcelo Tosatti <mtosatti@...hat.com>,
	Gleb Natapov <gleb@...nel.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Alexey Kardashevskiy <aik@...abs.ru>
Subject: Re: linux-next: manual merge of the kvm-ppc tree with the kvm tree

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/