| Message ID | 1351591345-23071-1-git-send-email-agraf@suse.de |
|---|---|
| State | New, archived |
| Headers | show |
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...). -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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... Alex-- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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?
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. Alex > > > -- > error compiling committee.c: too many arguments to function -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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.
On Wed, Oct 31, 2012 at 12:26:04PM +0200, Avi Kivity 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? There will be, and fsl_hcalls.h needs fixup (better Alexander verify i did not screw up anything else). -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Oct 31, 2012 at 11:22:55AM +0100, 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... > > Alex queue -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 31.10.2012, at 12:25, Marcelo Tosatti wrote: > On Wed, Oct 31, 2012 at 12:26:04PM +0200, Avi Kivity 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? > > There will be, and fsl_hcalls.h needs fixup (better Alexander verify > i did not screw up anything else). I pushed a tree where I merged for-upstream and your queue and hopefully fixed up the whole mess. It's available as for-queue on my github tree. Alex -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Avi / Marcelo, This is my current patch queue for ppc. Please pull. Headline changes are: * Fix 440 target * Fix uapi conflict * Book3S HV: Allow for lazy thread joining Alex The following changes since commit 8ca40a70a70988c0bdea106c894843f763ca2989: Christoffer Dall (1): KVM: Take kvm instead of vcpu to mmu_notifier_retry are available in the git repository at: git://github.com/agraf/linux-2.6.git for-upstream Alexander Graf (4): KVM: PPC: 44x: fix DCR read/write KVM: Documentation: Fix reentry-to-be-consistent paragraph KVM: PPC: Move mtspr/mfspr emulation into own functions PPC: ePAPR: Convert header to uapi Paul Mackerras (8): KVM: PPC: Book3S HV: Allow KVM guests to stop secondary threads coming online KVM: PPC: Book3S HV: Fix some races in starting secondary threads KVM: PPC: Book3s HV: Don't access runnable threads list without vcore lock KVM: PPC: Book3S HV: Fixes for late-joining threads KVM: PPC: Book3S HV: Run virtual core whenever any vcpus in it can run KVM: PPC: Book3S HV: Fix accounting of stolen time KVM: PPC: Book3S HV: Allow DTL to be set to address 0, length 0 KVM: PPC: Book3S HV: Fix thinko in try_lock_hpte() Documentation/virtual/kvm/api.txt | 3 +- arch/powerpc/include/asm/Kbuild | 1 - arch/powerpc/include/asm/epapr_hcalls.h | 55 +----- arch/powerpc/include/asm/kvm_asm.h | 1 + arch/powerpc/include/asm/kvm_book3s_64.h | 2 +- arch/powerpc/include/asm/kvm_host.h | 17 +- arch/powerpc/include/asm/smp.h | 8 + arch/powerpc/include/uapi/asm/Kbuild | 1 + arch/powerpc/include/uapi/asm/epapr_hcalls.h | 98 ++++++++ arch/powerpc/kernel/smp.c | 46 ++++ arch/powerpc/kvm/44x_emulate.c | 2 + arch/powerpc/kvm/book3s_hv.c | 316 ++++++++++++++++++-------- arch/powerpc/kvm/book3s_hv_rmhandlers.S | 11 +- arch/powerpc/kvm/emulate.c | 221 ++++++++++-------- 14 files changed, 518 insertions(+), 264 deletions(-) create mode 100644 arch/powerpc/include/uapi/asm/epapr_hcalls.h -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html