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

2015-04-16 Thread Christoffer Dall
Hi Paolo and Marc, On Tue, Apr 07, 2015 at 06:20:15PM +0200, Paolo Bonzini wrote: On 18/03/2015 08:55, Christoffer Dall wrote: Hi Stephen, On Wed, Mar 18, 2015 at 02:41:11PM +1100, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in

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

2015-04-16 Thread Paolo Bonzini
On 16/04/2015 21:10, Christoffer Dall wrote: As it turns out, it was not the same logic as Stephen's resolution. Stephen's resolution is bussy, because vlr is passed by value to vgic_queue_irq_to_lr() and therefore the call to sync the elrsr does not have any effect. Unfortunately, it

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

2015-04-08 Thread Christoffer Dall
On Wed, Apr 08, 2015 at 09:15:13AM +0100, Marc Zyngier wrote: On Tue, 7 Apr 2015 17:20:15 +0100 Paolo Bonzini pbonz...@redhat.com wrote: Hi Paolo, On 18/03/2015 08:55, Christoffer Dall wrote: Hi Stephen, On Wed, Mar 18, 2015 at 02:41:11PM +1100, Stephen Rothwell wrote: Hi

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

2015-04-08 Thread Marc Zyngier
On Tue, 7 Apr 2015 17:20:15 +0100 Paolo Bonzini pbonz...@redhat.com wrote: Hi Paolo, On 18/03/2015 08:55, Christoffer Dall wrote: Hi Stephen, On Wed, Mar 18, 2015 at 02:41:11PM +1100, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in

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

2015-04-07 Thread Paolo Bonzini
On 18/03/2015 08:55, Christoffer Dall wrote: Hi Stephen, On Wed, Mar 18, 2015 at 02:41:11PM +1100, 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 ae705930fca6 (arm/arm64: KVM: Keep elrsr/aisr in sync with

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

2015-03-18 Thread Christoffer Dall
Hi Stephen, On Wed, Mar 18, 2015 at 02:41:11PM +1100, 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 ae705930fca6 (arm/arm64: KVM: Keep elrsr/aisr in sync with software model) from Linus' tree and commit