From: Martin Schwidefsky <schwidefsky@de.ibm.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
linux-kernel <linux-kernel@vger.kernel.org>,
kvm <kvm@vger.kernel.org>, Gleb Natapov <gleb@redhat.com>,
Avi Kivity <avi.kivity@gmail.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>
Subject: Re: [GIT PULL] KVM updates for the 3.9 merge window
Date: Mon, 25 Feb 2013 12:21:28 +0100 [thread overview]
Message-ID: <20130225122128.7eb40d9f@mschwide> (raw)
In-Reply-To: <CA+55aFy_SMKQ27JR6iO5GcNKaTR0aRZm8BKtJ+0gUibXeCLBUQ@mail.gmail.com>
On Sun, 24 Feb 2013 16:05:31 -0800
Linus Torvalds <torvalds@linux-foundation.org> wrote:
> On Wed, Feb 20, 2013 at 5:17 PM, Marcelo Tosatti <mtosatti@redhat.com> wrote:
> >
> > Please pull from
> >
> > git://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/kvm-3.9-1
> >
> > to receive the KVM updates for the 3.9 merge window [..]
>
> Ok, particularly the s390 people should check me resolution of the
> conflicts, since they include the renaming of IOINT_VIR to IRQIO_VIR.
> But the uapi header file move should be couble-checked by people who
> use this too.
The IRQIO_VIR is now at the end of the IRQIO_xxx entries while we had
it between the IRQIO_CSC and the IRQIO_PCI entry. No worry, we just
change our code and use the upstream version. Just completed the
double-check and pushed my branches to the linux-s390 tree. The code
is in sync.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
prev parent reply other threads:[~2013-02-25 11:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-21 1:17 [GIT PULL] KVM updates for the 3.9 merge window Marcelo Tosatti
2013-02-25 0:05 ` Linus Torvalds
2013-02-25 11:21 ` Martin Schwidefsky [this message]
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=20130225122128.7eb40d9f@mschwide \
--to=schwidefsky@de.ibm.com \
--cc=avi.kivity@gmail.com \
--cc=gleb@redhat.com \
--cc=heiko.carstens@de.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.