linux-kernel - Re: [GIT PULL] KVM updates for the 3.6 merge window

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] [day] [month] [year] [list]

Date:	Wed, 25 Jul 2012 11:09:43 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Benjamin Herrenschmidt <benh@...nel.crashing.org>
Cc:	Linus Torvalds <torvalds@...ux-foundation.org>,
	Avi Kivity <avi@...hat.com>,
	Martin Schwidefsky <schwidefsky@...ibm.com>,
	linux-kernel <linux-kernel@...r.kernel.org>,
	Marcelo Tosatti <mtosatti@...hat.com>,
	KVM list <kvm@...r.kernel.org>, Alexander Graf <agraf@...e.de>
Subject: Re: [GIT PULL] KVM updates for the 3.6 merge window

On Wed, 25 Jul 2012 08:38:36 +1000 Benjamin Herrenschmidt <benh@...nel.crashing.org> wrote:
>
> On Tue, 2012-07-24 at 12:04 -0700, Linus Torvalds wrote:
> > Ok, this caused conflicts with the s390 and ppc trees. I think I fixed
> > them correctly, but the respective arch people really should take a
> > look.
> 
> A quick peek at the merge commit looks allright, but Alex mentioned that
> there's some more fallover that needs an actual patch to fix (the
> changes to enforce a cleaner ASM syntax need to be applied to some new
> code from Avi's tree that didn't actually trigger merge conflicts).
> 
> I'll follow up with Alex and send you the relevant patches if any.

There was at least one, but Linus got it (I checked all the mentions of
VCPU_GPR).  His merge resolution matches the one that has been in
linux-next for quite some time.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped