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

2020-08-09 Thread Stephen Rothwell
Hi all, On Mon, 13 Jul 2020 14:40:36 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the kvm-arm tree got a conflict in: > > arch/arm64/kvm/mmu.c > > between commit: > > c1a33aebe91d ("KVM: arm64: Use common KVM implementation of MMU memory > caches") > > from the kvm tree

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

2020-08-09 Thread Stephen Rothwell
Hi all, On Mon, 13 Jul 2020 14:39:35 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the kvm-arm tree got conflicts in: > > arch/arm64/include/asm/kvm_coproc.h > arch/arm64/kvm/handle_exit.c > > between commit: > > 74cc7e0c35c1 ("KVM: arm64: clean up redundant 'kvm_run' p

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

2017-04-09 Thread Christoffer Dall
Hi Stephen, On Mon, Apr 10, 2017 at 01:52:42PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm-arm tree got conflicts in: > > Documentation/virtual/kvm/api.txt > include/uapi/linux/kvm.h > > between commits: > > a8a3c426772e ("KVM: MIPS: Add VZ & TE capab

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

2015-10-15 Thread Wu, Feng
> -Original Message- > From: Stephen Rothwell [mailto:s...@canb.auug.org.au] > Sent: Friday, October 16, 2015 11:53 AM > To: Christoffer Dall ; Marc Zyngier > ; Marcelo Tosatti ; Gleb > Natapov ; k...@vger.kernel.org > Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org; Wu, Feng

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

2014-11-26 Thread Christoffer Dall
Thanks Stephen, it was (obviously) the right fix. -Christoffer On Wed, Nov 26, 2014 at 7:19 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm-arm tree got a conflict in > arch/ia64/kvm/kvm-ia64.c between commit 003f7de62589 ("KVM: ia64: > remove") from the kvm tree an

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

2014-09-18 Thread Marc Zyngier
On Thu, Sep 18 2014 at 04:52:26 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm-arm tree got a conflict in > virt/kvm/arm/vgic.c between commit c06a841bf363 ("KVM: ARM: vgic: > register kvm_device_ops dynamically") from the kvm tree and commit > de56fb1923ca ("KVM: v