From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Avi Kivity <avi@redhat.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
linux-kernel <linux-kernel@vger.kernel.org>,
Marcelo Tosatti <mtosatti@redhat.com>,
KVM list <kvm@vger.kernel.org>, Alexander Graf <agraf@suse.de>
Subject: Re: [GIT PULL] KVM updates for the 3.6 merge window
Date: Wed, 25 Jul 2012 08:38:36 +1000 [thread overview]
Message-ID: <1343169516.3715.25.camel@pasglop> (raw)
In-Reply-To: <CA+55aFygKruOf1G5bjfE3mpvaMP3B7Eg3Hh2=HpMO=M8fDX=tw@mail.gmail.com>
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/
next prev parent reply other threads:[~2012-07-24 22:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-23 9:12 [GIT PULL] KVM updates for the 3.6 merge window Avi Kivity
2012-07-24 19:04 ` Linus Torvalds
2012-07-24 22:38 ` Benjamin Herrenschmidt [this message]
2012-07-25 1:09 ` 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=1343169516.3715.25.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=agraf@suse.de \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=schwidefsky@de.ibm.com \
--cc=torvalds@linux-foundation.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox