Re: linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree

2019-05-01 Thread Dave Martin
On Wed, May 01, 2019 at 04:09:02PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm-ppc tree got a conflict in: > > include/uapi/linux/kvm.h > > between commits: > > 555f3d03e7fb ("KVM: arm64: Add a capability to advertise SVE support") > a243c16d18be ("KVM

linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree

2019-04-30 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm-ppc tree got a conflict in: include/uapi/linux/kvm.h between commits: 555f3d03e7fb ("KVM: arm64: Add a capability to advertise SVE support") a243c16d18be ("KVM: arm64: Add capability to advertise ptrauth for guest") from the kvm-arm tree and co

Re: linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree

2018-10-11 Thread Paolo Bonzini
On 11/10/2018 04:06, Stephen Rothwell wrote: > Hi all, > > On Wed, 10 Oct 2018 13:22:24 +1100 Stephen Rothwell > wrote: >> >> Today's linux-next merge of the kvm-ppc tree got a conflict in: >> >> include/uapi/linux/kvm.h >> >> between commit: >> >> 233a7cb23531 ("kvm: arm64: Allow tuning the

Re: linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree

2018-10-10 Thread Stephen Rothwell
Hi all, On Wed, 10 Oct 2018 13:22:24 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the kvm-ppc tree got a conflict in: > > include/uapi/linux/kvm.h > > between commit: > > 233a7cb23531 ("kvm: arm64: Allow tuning the physical address size for VM") > > from the kvm-arm tree

linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree

2018-10-09 Thread Stephen Rothwell
Hi Paul, Today's linux-next merge of the kvm-ppc tree got a conflict in: include/uapi/linux/kvm.h between commit: 233a7cb23531 ("kvm: arm64: Allow tuning the physical address size for VM") from the kvm-arm tree and commit: aa069a996951 ("KVM: PPC: Book3S HV: Add a VM capability to enabl

linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree

2017-04-19 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm-ppc tree got a conflict in: include/uapi/linux/kvm.h between commit: 3fe17e682616 ("KVM: arm/arm64: Add ARM user space interrupt signaling ABI") from the kvm-arm tree and commit: 4898d3f49b5b ("KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capabili