Hi Paul,
Today's linux-next merge of the kvm-ppc tree got a conflict in:
include/uapi/linux/kvm.h
between commit:
a8a3c426772e ("KVM: MIPS: Add VZ & TE capabilities")
from the kvm tree and commit:
2e60acebefd8 ("KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capability number")
from the
Hi Paul,
Today's linux-next merge of the kvm-ppc tree got a conflict in:
include/uapi/linux/kvm.h
between commit:
a8a3c426772e ("KVM: MIPS: Add VZ & TE capabilities")
from the kvm tree and commit:
2e60acebefd8 ("KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capability number")
from the
Hi Paolo,
On Tue, 05 Aug 2014 13:39:39 +0200 Paolo Bonzini wrote:
>
> Il 05/08/2014 12:13, Stephen Rothwell ha scritto:
> >> > And I suppose it'd be nice to replace tabs with spaces for consistency
> >> > (since that's one of the things bf5590f37919 did).
> >> >
> >> > How about this fixup
Il 05/08/2014 12:13, Stephen Rothwell ha scritto:
>> > And I suppose it'd be nice to replace tabs with spaces for consistency
>> > (since that's one of the things bf5590f37919 did).
>> >
>> > How about this fixup patch?
> Thanks for that I have applied it to my merge resolution.
I've now merged
Hi James,
On Tue, 5 Aug 2014 11:00:36 +0100 James Hogan wrote:
>
> On 04/08/14 09:04, Stephen Rothwell wrote:
> > + PPC | KVM_REG_PPC_LPCR | 64
>
> I think due to a0840240c0c6 this one should be s/64/32/.
>
> > ++ PPC | KVM_REG_PPC_LPCR_64 | 64
>
> And I
Hi Stephen,
On 04/08/14 09:04, Stephen Rothwell wrote:
> + PPC | KVM_REG_PPC_LPCR | 64
I think due to a0840240c0c6 this one should be s/64/32/.
> ++ PPC | KVM_REG_PPC_LPCR_64 | 64
And I suppose it'd be nice to replace tabs with spaces for consistency
(since
Hi Stephen,
On 04/08/14 09:04, Stephen Rothwell wrote:
+ PPC | KVM_REG_PPC_LPCR | 64
I think due to a0840240c0c6 this one should be s/64/32/.
++ PPC | KVM_REG_PPC_LPCR_64 | 64
And I suppose it'd be nice to replace tabs with spaces for consistency
(since
Hi James,
On Tue, 5 Aug 2014 11:00:36 +0100 James Hogan james.ho...@imgtec.com wrote:
On 04/08/14 09:04, Stephen Rothwell wrote:
+ PPC | KVM_REG_PPC_LPCR | 64
I think due to a0840240c0c6 this one should be s/64/32/.
++ PPC | KVM_REG_PPC_LPCR_64 | 64
Il 05/08/2014 12:13, Stephen Rothwell ha scritto:
And I suppose it'd be nice to replace tabs with spaces for consistency
(since that's one of the things bf5590f37919 did).
How about this fixup patch?
Thanks for that I have applied it to my merge resolution.
I've now merged kvm-ppc and
Hi Paolo,
On Tue, 05 Aug 2014 13:39:39 +0200 Paolo Bonzini pbonz...@redhat.com wrote:
Il 05/08/2014 12:13, Stephen Rothwell ha scritto:
And I suppose it'd be nice to replace tabs with spaces for consistency
(since that's one of the things bf5590f37919 did).
How about this fixup
Hi Alexander,
Today's linux-next merge of the kvm-ppc tree got a conflict in
Documentation/virtual/kvm/api.txt between commit bf5590f37919 ("KVM:
Reformat KVM_SET_ONE_REG register documentation") from the kvm tree and
commit a0840240c0c6 ("KVM: PPC: Book3S: Fix LPCR one_reg interface")
from the
Hi Alexander,
Today's linux-next merge of the kvm-ppc tree got a conflict in
Documentation/virtual/kvm/api.txt between commit bf5590f37919 (KVM:
Reformat KVM_SET_ONE_REG register documentation) from the kvm tree and
commit a0840240c0c6 (KVM: PPC: Book3S: Fix LPCR one_reg interface)
from the
Hi Alexander,
Today's linux-next merge of the kvm-ppc tree got a conflict in
Documentation/virtual/kvm/api.txt between commit 8a366a4bae15 ("KVM:
s390: document KVM_CAP_S390_IRQCHIP") from the kvm tree and commit
dfc17cc2ded1 ("KVM: PPC: Book3S: Controls for in-kernel sPAPR hypercall
handling")
Hi Alexander,
Today's linux-next merge of the kvm-ppc tree got a conflict in
Documentation/virtual/kvm/api.txt between commit 8a366a4bae15 (KVM:
s390: document KVM_CAP_S390_IRQCHIP) from the kvm tree and commit
dfc17cc2ded1 (KVM: PPC: Book3S: Controls for in-kernel sPAPR hypercall
handling) from
Hi Alexander,
Today's linux-next merge of the kvm-ppc tree got a conflict in
arch/powerpc/kvm/44x_emulate.c between commits from the kvm tree and
the same patches plus another commit from the kvm-ppc tree.
I just used the kvm-ppc tree version.
This happened because
1) you
Hi Alexander,
Today's linux-next merge of the kvm-ppc tree got a conflict in
arch/powerpc/kvm/44x_emulate.c between commits from the kvm tree and
the same patches plus another commit from the kvm-ppc tree.
I just used the kvm-ppc tree version.
This happened because
1) you
Hi Alexander,
Today's linux-next merge of the kvm-ppc tree got a conflict in
include/linux/kvm.h between commit 4d8b81abc47b ("KVM: introduce readonly
memslot") from the kvm tree and commit 1db21d25a11b ("KVM: PPC: booke:
Add watchdog emulation") from the kvm-ppc tree.
I fixed it up (see below)
Hi Alexander,
Today's linux-next merge of the kvm-ppc tree got a conflict in
include/linux/kvm.h between commit 4d8b81abc47b (KVM: introduce readonly
memslot) from the kvm tree and commit 1db21d25a11b (KVM: PPC: booke:
Add watchdog emulation) from the kvm-ppc tree.
I fixed it up (see below) and
18 matches
Mail list logo
