From: Alexander Graf <agraf@suse.de>
To: Paolo Bonzini <pbonzini@redhat.com>,
Paul Mackerras <paulus@samba.org>,
kvm-ppc@vger.kernel.org, kvm@vger.kernel.org,
Marcelo Tosatti <mtosatti@redhat.com>
Subject: Re: [PATCH v2 00/12] Remaining improvements for HV KVM
Date: Wed, 15 Apr 2015 22:19:02 +0200 [thread overview]
Message-ID: <552EC7B6.8080707@suse.de> (raw)
In-Reply-To: <55263D32.1010201@redhat.com>
On 09.04.15 10:49, Paolo Bonzini wrote:
>
>
> On 09/04/2015 00:57, Alexander Graf wrote:
>>>
>>> The last patch in this series needs a definition of PPC_MSGCLR that is
>>> added by the patch "powerpc/powernv: Fixes for hypervisor doorbell
>>> handling", which has now gone upstream into Linus' tree as commit
>>> 755563bc79c7 via the linuxppc-dev mailing list. Alex, how do you want
>>> to handle that? You could pull in the master branch of the kvm tree,
>>> which includes 755563bc79c7, or you could cherry-pick 755563bc79c7 and
>>> let the subsequent merge fix it up.
>>
>> I've just cherry-picked it for now since it still lives in my queue, so
>> it will get thrown out automatically once I rebase on next if it's
>> included in there.
>>
>> Paolo / Marcelo, could you please try to somehow get the commit above
>> into the next branch somehow? I guess the easiest would be to merge
>> linus/master into kvm/next.
>>
>> Thanks, applied all to kvm-ppc-queue.
>
> I plan to send the x86/MIPS/s390/ARM merge very early to Linus, maybe
> even tomorrow. So you can just rebase on top of 4.0-rc6 and send your
> pull request relative to Linus's tree instead of kvm/next.
>
> Does that work for you?
Phew, that really complicates things on my side. I usually do
kvm-ppc-queue -> kvm-ppc-next -> kvm/next
which means that my queue already contains your next patches. I could of
course to a rebase --onto and remove anything that is in the kvm tree,
but then we'd end up conflicting on documentation changes.
Since you already did send out the first pull request, just let me know
when you pulled linus' tree back into kvm/next (or kvm/master) so that I
can fast-forward merge this in my kvm-ppc-next branch and then rebase my
queue on top, merge it into the next branch and send you a pull request ;)
Alex
WARNING: multiple messages have this Message-ID (diff)
From: Alexander Graf <agraf@suse.de>
To: Paolo Bonzini <pbonzini@redhat.com>,
Paul Mackerras <paulus@samba.org>,
kvm-ppc@vger.kernel.org, kvm@vger.kernel.org,
Marcelo Tosatti <mtosatti@redhat.com>
Subject: Re: [PATCH v2 00/12] Remaining improvements for HV KVM
Date: Wed, 15 Apr 2015 20:19:02 +0000 [thread overview]
Message-ID: <552EC7B6.8080707@suse.de> (raw)
In-Reply-To: <55263D32.1010201@redhat.com>
On 09.04.15 10:49, Paolo Bonzini wrote:
>
>
> On 09/04/2015 00:57, Alexander Graf wrote:
>>>
>>> The last patch in this series needs a definition of PPC_MSGCLR that is
>>> added by the patch "powerpc/powernv: Fixes for hypervisor doorbell
>>> handling", which has now gone upstream into Linus' tree as commit
>>> 755563bc79c7 via the linuxppc-dev mailing list. Alex, how do you want
>>> to handle that? You could pull in the master branch of the kvm tree,
>>> which includes 755563bc79c7, or you could cherry-pick 755563bc79c7 and
>>> let the subsequent merge fix it up.
>>
>> I've just cherry-picked it for now since it still lives in my queue, so
>> it will get thrown out automatically once I rebase on next if it's
>> included in there.
>>
>> Paolo / Marcelo, could you please try to somehow get the commit above
>> into the next branch somehow? I guess the easiest would be to merge
>> linus/master into kvm/next.
>>
>> Thanks, applied all to kvm-ppc-queue.
>
> I plan to send the x86/MIPS/s390/ARM merge very early to Linus, maybe
> even tomorrow. So you can just rebase on top of 4.0-rc6 and send your
> pull request relative to Linus's tree instead of kvm/next.
>
> Does that work for you?
Phew, that really complicates things on my side. I usually do
kvm-ppc-queue -> kvm-ppc-next -> kvm/next
which means that my queue already contains your next patches. I could of
course to a rebase --onto and remove anything that is in the kvm tree,
but then we'd end up conflicting on documentation changes.
Since you already did send out the first pull request, just let me know
when you pulled linus' tree back into kvm/next (or kvm/master) so that I
can fast-forward merge this in my kvm-ppc-next branch and then rebase my
queue on top, merge it into the next branch and send you a pull request ;)
Alex
next prev parent reply other threads:[~2015-04-15 20:19 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-28 3:21 [PATCH v2 00/12] Remaining improvements for HV KVM Paul Mackerras
2015-03-28 3:21 ` Paul Mackerras
2015-03-28 3:21 ` [PATCH 01/12] KVM: PPC: Book3S HV: Create debugfs file for each guest's HPT Paul Mackerras
2015-03-28 3:21 ` Paul Mackerras
2015-03-28 3:21 ` [PATCH 02/12] KVM: PPC: Book3S HV: Accumulate timing information for real-mode code Paul Mackerras
2015-03-28 3:21 ` Paul Mackerras
2015-03-28 3:21 ` [PATCH 03/12] KVM: PPC: Book3S HV: Simplify handling of VCPUs that need a VPA update Paul Mackerras
2015-03-28 3:21 ` Paul Mackerras
2015-03-28 3:21 ` [PATCH 04/12] KVM: PPC: Book3S HV: Minor cleanups Paul Mackerras
2015-03-28 3:21 ` Paul Mackerras
2015-03-28 3:21 ` [PATCH 05/12] KVM: PPC: Book3S HV: Move vcore preemption point up into kvmppc_run_vcpu Paul Mackerras
2015-03-28 3:21 ` Paul Mackerras
2015-03-28 3:21 ` [PATCH 06/12] KVM: PPC: Book3S HV: Get rid of vcore nap_count and n_woken Paul Mackerras
2015-03-28 3:21 ` Paul Mackerras
2015-03-28 3:21 ` [PATCH 07/12] KVM: PPC: Book3S HV: Don't wake thread with no vcpu on guest IPI Paul Mackerras
2015-03-28 3:21 ` Paul Mackerras
2015-03-28 3:21 ` [PATCH 08/12] KVM: PPC: Book3S HV: Use decrementer to wake napping threads Paul Mackerras
2015-03-28 3:21 ` Paul Mackerras
2015-03-28 3:21 ` [PATCH 09/12] KVM: PPC: Book3S HV: Use bitmap of active threads rather than count Paul Mackerras
2015-03-28 3:21 ` Paul Mackerras
2015-03-28 3:21 ` [PATCH 10/12] KVM: PPC: Book3S HV: Streamline guest entry and exit Paul Mackerras
2015-03-28 3:21 ` Paul Mackerras
2015-03-28 3:21 ` [PATCH 11/12] KVM: PPC: Book3S HV: Translate kvmhv_commence_exit to C Paul Mackerras
2015-03-28 3:21 ` Paul Mackerras
2015-03-28 3:21 ` [PATCH 12/12] KVM: PPC: Book3S HV: Use msgsnd for signalling threads on POWER8 Paul Mackerras
2015-03-28 3:21 ` Paul Mackerras
2015-04-08 22:57 ` [PATCH v2 00/12] Remaining improvements for HV KVM Alexander Graf
2015-04-08 22:57 ` Alexander Graf
2015-04-09 8:49 ` Paolo Bonzini
2015-04-09 8:49 ` Paolo Bonzini
2015-04-15 20:19 ` Alexander Graf [this message]
2015-04-15 20:19 ` Alexander Graf
2015-04-16 9:20 ` Paolo Bonzini
2015-04-16 9:20 ` Paolo Bonzini
2015-04-14 11:56 ` Paul Mackerras
2015-04-14 11:56 ` Paul Mackerras
2015-04-15 20:16 ` Alexander Graf
2015-04-15 20:16 ` Alexander Graf
2015-04-22 6:09 ` Paul Mackerras
2015-04-22 6:09 ` Paul Mackerras
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=552EC7B6.8080707@suse.de \
--to=agraf@suse.de \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=paulus@samba.org \
--cc=pbonzini@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 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.