From: Avi Kivity <avi@redhat.com>
To: Alexander Graf <agraf@suse.de>
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
KVM list <kvm@vger.kernel.org>, kvm-ppc <kvm-ppc@vger.kernel.org>
Subject: Re: [PULL 00/12] ppc patch queue 2012-10-30
Date: Wed, 31 Oct 2012 11:17:24 +0000 [thread overview]
Message-ID: <509108C4.9090202@redhat.com> (raw)
In-Reply-To: <02B0911D-756E-4A51-A689-7ACA2B4D6699@suse.de>
On 10/31/2012 12:34 PM, Alexander Graf wrote:
>
>
> On 31.10.2012, at 11:26, Avi Kivity <avi@redhat.com> wrote:
>
>> On 10/31/2012 12:22 PM, Alexander Graf wrote:
>>>
>>>
>>> On 31.10.2012, at 02:32, Marcelo Tosatti <mtosatti@redhat.com> wrote:
>>>
>>>> On Tue, Oct 30, 2012 at 11:02:13AM +0100, Alexander Graf wrote:
>>>>> Hi Avi / Marcelo,
>>>>>
>>>>> This is my current patch queue for ppc. Please pull.
>>>>>
>>>>> Headline changes are:
>>>>>
>>>>> * Fix 440 target
>>>>> * Fix uapi conflict
>>>>
>>>> Can you regenerate against queue branch? (btw i forgot to update fsl_hcalls.h...).
>>>
>>> Hrm. So which branch am I supposed to base against? Master, next or queue? This one is against next...
>>
>> next and queue should be compatible (queue = next + a few patches). Are
>> there any conflicts when merging against queue?
>
> I merely want to know which one I should work against. So far I was under the impression that next is the one.
It is. queue might be rebased at times.
--
error compiling committee.c: too many arguments to function
WARNING: multiple messages have this Message-ID (diff)
From: Avi Kivity <avi@redhat.com>
To: Alexander Graf <agraf@suse.de>
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
KVM list <kvm@vger.kernel.org>, kvm-ppc <kvm-ppc@vger.kernel.org>
Subject: Re: [PULL 00/12] ppc patch queue 2012-10-30
Date: Wed, 31 Oct 2012 13:17:24 +0200 [thread overview]
Message-ID: <509108C4.9090202@redhat.com> (raw)
In-Reply-To: <02B0911D-756E-4A51-A689-7ACA2B4D6699@suse.de>
On 10/31/2012 12:34 PM, Alexander Graf wrote:
>
>
> On 31.10.2012, at 11:26, Avi Kivity <avi@redhat.com> wrote:
>
>> On 10/31/2012 12:22 PM, Alexander Graf wrote:
>>>
>>>
>>> On 31.10.2012, at 02:32, Marcelo Tosatti <mtosatti@redhat.com> wrote:
>>>
>>>> On Tue, Oct 30, 2012 at 11:02:13AM +0100, Alexander Graf wrote:
>>>>> Hi Avi / Marcelo,
>>>>>
>>>>> This is my current patch queue for ppc. Please pull.
>>>>>
>>>>> Headline changes are:
>>>>>
>>>>> * Fix 440 target
>>>>> * Fix uapi conflict
>>>>
>>>> Can you regenerate against queue branch? (btw i forgot to update fsl_hcalls.h...).
>>>
>>> Hrm. So which branch am I supposed to base against? Master, next or queue? This one is against next...
>>
>> next and queue should be compatible (queue = next + a few patches). Are
>> there any conflicts when merging against queue?
>
> I merely want to know which one I should work against. So far I was under the impression that next is the one.
It is. queue might be rebased at times.
--
error compiling committee.c: too many arguments to function
next prev parent reply other threads:[~2012-10-31 11:17 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-30 10:02 [PULL 00/12] ppc patch queue 2012-10-30 Alexander Graf
2012-10-30 10:02 ` Alexander Graf
2012-10-30 10:02 ` [PATCH 01/12] KVM: PPC: 44x: fix DCR read/write Alexander Graf
2012-10-30 10:02 ` Alexander Graf
2012-10-30 10:02 ` [PATCH 02/12] KVM: Documentation: Fix reentry-to-be-consistent paragraph Alexander Graf
2012-10-30 10:02 ` Alexander Graf
2012-10-30 10:02 ` [PATCH 03/12] KVM: PPC: Move mtspr/mfspr emulation into own functions Alexander Graf
2012-10-30 10:02 ` Alexander Graf
2012-10-30 10:02 ` [PATCH 04/12] PPC: ePAPR: Convert header to uapi Alexander Graf
2012-10-30 10:02 ` Alexander Graf
2012-10-30 10:02 ` [PATCH 05/12] KVM: PPC: Book3S HV: Allow KVM guests to stop secondary threads coming online Alexander Graf
2012-10-30 10:02 ` Alexander Graf
2012-10-30 10:02 ` [PATCH 06/12] KVM: PPC: Book3S HV: Fix some races in starting secondary threads Alexander Graf
2012-10-30 10:02 ` Alexander Graf
2012-10-30 10:02 ` [PATCH 07/12] KVM: PPC: Book3s HV: Don't access runnable threads list without vcore lock Alexander Graf
2012-10-30 10:02 ` Alexander Graf
2012-10-30 10:02 ` [PATCH 08/12] KVM: PPC: Book3S HV: Fixes for late-joining threads Alexander Graf
2012-10-30 10:02 ` Alexander Graf
2012-10-30 10:02 ` [PATCH 09/12] KVM: PPC: Book3S HV: Run virtual core whenever any vcpus in it can run Alexander Graf
2012-10-30 10:02 ` Alexander Graf
2012-10-30 10:02 ` [PATCH 10/12] KVM: PPC: Book3S HV: Fix accounting of stolen time Alexander Graf
2012-10-30 10:02 ` Alexander Graf
2012-10-30 10:02 ` [PATCH 11/12] KVM: PPC: Book3S HV: Allow DTL to be set to address 0, length 0 Alexander Graf
2012-10-30 10:02 ` Alexander Graf
2012-10-30 10:02 ` [PATCH 12/12] KVM: PPC: Book3S HV: Fix thinko in try_lock_hpte() Alexander Graf
2012-10-30 10:02 ` Alexander Graf
2012-10-31 1:32 ` [PULL 00/12] ppc patch queue 2012-10-30 Marcelo Tosatti
2012-10-31 1:32 ` Marcelo Tosatti
2012-10-31 10:22 ` Alexander Graf
2012-10-31 10:22 ` Alexander Graf
2012-10-31 10:26 ` Avi Kivity
2012-10-31 10:26 ` Avi Kivity
2012-10-31 10:34 ` Alexander Graf
2012-10-31 10:34 ` Alexander Graf
2012-10-31 11:17 ` Avi Kivity [this message]
2012-10-31 11:17 ` Avi Kivity
2012-10-31 11:25 ` Marcelo Tosatti
2012-10-31 11:25 ` Marcelo Tosatti
2012-10-31 12:47 ` Alexander Graf
2012-10-31 12:47 ` Alexander Graf
2012-10-31 11:28 ` Marcelo Tosatti
2012-10-31 11:28 ` Marcelo Tosatti
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=509108C4.9090202@redhat.com \
--to=avi@redhat.com \
--cc=agraf@suse.de \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@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 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.