From: Paolo Bonzini <pbonzini@redhat.com>
To: Christian Borntraeger <borntraeger@de.ibm.com>,
KVM <kvm@vger.kernel.org>
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
Alexander Graf <agraf@suse.de>,
Cornelia Huck <cornelia.huck@de.ibm.com>,
Jens Freimann <jfrei@linux.vnet.ibm.com>,
linux-s390 <linux-s390@vger.kernel.org>
Subject: Re: [GIT PULL 0/8] KVM: s390: Features and fixes for 4.1 (kvm/next)
Date: Tue, 31 Mar 2015 18:14:11 +0200 [thread overview]
Message-ID: <551AC7D3.5010408@redhat.com> (raw)
In-Reply-To: <551AC726.7000407@redhat.com>
On 31/03/2015 18:11, Paolo Bonzini wrote:
>
>
> On 31/03/2015 15:01, Christian Borntraeger wrote:
>> git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvm-s390-next-20150331
>
> Looks good, pulled.
Oops, spoke too soon! It conflicts with the MIPS pull request due to
overlapping capability numbers. Please use 113 and 114; since the MIPS
pull request is in kvm/queue only, do not rebase: just fix the two
numbers and I'll resolve the conflict myself.
Paolo
prev parent reply other threads:[~2015-03-31 16:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-31 13:01 [GIT PULL 0/8] KVM: s390: Features and fixes for 4.1 (kvm/next) Christian Borntraeger
2015-03-31 13:01 ` [GIT PULL 1/8] KVM: s390: store the breaking-event address on pgm interrupts Christian Borntraeger
2015-03-31 13:01 ` [GIT PULL 2/8] KVM: s390: enable more features that need no hypervisor changes Christian Borntraeger
2015-03-31 13:01 ` [GIT PULL 3/8] KVM: s390: fix get_all_floating_irqs Christian Borntraeger
2015-03-31 14:12 ` Heiko Carstens
2015-03-31 14:42 ` Christian Borntraeger
2015-03-31 13:01 ` [GIT PULL 4/8] KVM: s390: deliver floating interrupts in order of priority Christian Borntraeger
2015-03-31 13:02 ` [GIT PULL 5/8] KVM: s390: cpu timer irq priority Christian Borntraeger
2015-03-31 13:02 ` [GIT PULL 6/8] KVM: s390: add ioctl to inject local interrupts Christian Borntraeger
2015-03-31 13:02 ` [GIT PULL 7/8] KVM: s390: refactor vcpu injection function Christian Borntraeger
2015-03-31 13:02 ` [GIT PULL 8/8] KVM: s390: migrate vcpu interrupt state Christian Borntraeger
2015-03-31 16:11 ` [GIT PULL 0/8] KVM: s390: Features and fixes for 4.1 (kvm/next) Paolo Bonzini
2015-03-31 16:14 ` Paolo Bonzini [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=551AC7D3.5010408@redhat.com \
--to=pbonzini@redhat.com \
--cc=agraf@suse.de \
--cc=borntraeger@de.ibm.com \
--cc=cornelia.huck@de.ibm.com \
--cc=jfrei@linux.vnet.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mtosatti@redhat.com \
/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