Re: linux-next: manual merge of the kvms390 tree with the kvm-mips tree

2017-03-29 Thread James Hogan
On Wed, Mar 29, 2017 at 11:29:00AM +0200, Christian Borntraeger wrote: > On 03/29/2017 11:21 AM, James Hogan wrote: > > On Wed, Mar 29, 2017 at 02:08:32PM +1100, Stephen Rothwell wrote: > >> Hi all, > >> > >> Today's linux-next merge of the kvms390 tree got a conflict in: > >> > >> include/uapi/l

Re: linux-next: manual merge of the kvms390 tree with the kvm-mips tree

2017-03-29 Thread Paolo Bonzini
On 29/03/2017 11:29, Christian Borntraeger wrote: >>> -#define KVM_CAP_S390_GS 137 >>> +#define KVM_CAP_MIPS_VZ 137 >>> +#define KVM_CAP_MIPS_TE 138 >>> +#define KVM_CAP_MIPS_64BIT 139 >>> ++#define KVM_CAP_S390_GS 140 >>> >>> #ifdef KVM_CAP_IRQ_ROUTING >> Thanks Stephen, >> >> Cc'ing Pa

Re: linux-next: manual merge of the kvms390 tree with the kvm-mips tree

2017-03-29 Thread Christian Borntraeger
On 03/29/2017 11:21 AM, James Hogan wrote: > On Wed, Mar 29, 2017 at 02:08:32PM +1100, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the kvms390 tree got a conflict in: >> >> include/uapi/linux/kvm.h >> >> between commits: >> >> a8a3c426772e ("KVM: MIPS: Add VZ & TE capab

Re: linux-next: manual merge of the kvms390 tree with the kvm-mips tree

2017-03-29 Thread James Hogan
On Wed, Mar 29, 2017 at 02:08:32PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvms390 tree got a conflict in: > > include/uapi/linux/kvm.h > > between commits: > > a8a3c426772e ("KVM: MIPS: Add VZ & TE capabilities") > 578fd61d2d21 ("KVM: MIPS: Add 64BIT

linux-next: manual merge of the kvms390 tree with the kvm-mips tree

2017-03-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: include/uapi/linux/kvm.h between commits: a8a3c426772e ("KVM: MIPS: Add VZ & TE capabilities") 578fd61d2d21 ("KVM: MIPS: Add 64BIT capability") from the kvm-mips tree and commit: 4e0b1ab72b8a ("KVM: s390: gs suppo