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

Benjamin Herrenschmidt
2012-07-24T22:38:56Z

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.

Cheers,
Ben.

> Linus
>
> On Mon, Jul 23, 2012 at 2:12 AM, Avi Kivity <avi@redhat.com> wrote:
> > Linus, please pull from the repo and tag at:
> >
> > git://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/kvm-3.6-1
> >
> > to merge the KVM updates for the 3.5 merge window.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/