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

2018-01-03 Thread Christoffer Dall
Thanks Stephen, On Wed, Jan 3, 2018 at 3:38 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm-arm tree got a conflict in: > > virt/kvm/arm/arch_timer.c > > between commit: > > 36e5cfd410ad ("KVM: arm/arm64: Properly handle arch-timer IRQs after > vtimer_save_state

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

2018-01-02 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: virt/kvm/arm/arch_timer.c between commit: 36e5cfd410ad ("KVM: arm/arm64: Properly handle arch-timer IRQs after vtimer_save_state") from Linus' tree and commit: 70450a9fbe06 ("KVM: arm/arm64: Don't cache the timer I

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

2017-11-05 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/kvm/inject_fault.c between commit: fd6c8c206fc5 ("arm/arm64: KVM: set right LR register value for 32 bit guest when inject abort") from Linus' tree and commit: 00586cdaf597 ("KVM: arm/arm64: Unify 32bit

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

2017-11-05 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm/kvm/emulate.c between commit: fd6c8c206fc5 ("arm/arm64: KVM: set right LR register value for 32 bit guest when inject abort") from Linus' tree and commit: 00586cdaf597 ("KVM: arm/arm64: Unify 32bit fault i

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

2017-04-10 Thread Christoffer Dall
Hi Stephen, On Mon, Apr 10, 2017 at 02:02:08PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvm-arm tree got conflicts in: > > virt/kvm/arm/vgic/vgic-v2.c > virt/kvm/arm/vgic/vgic.h > > between commit: > > 5b0d2cc28058 ("KVM: arm64: Ensure LRs are clear wh

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

2017-04-09 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm-arm tree got conflicts in: virt/kvm/arm/vgic/vgic-v2.c virt/kvm/arm/vgic/vgic.h between commit: 5b0d2cc28058 ("KVM: arm64: Ensure LRs are clear when they should be") from Linus' tree and commits: 328e56647944 ("KVM: arm/arm64: vgic: Defer to

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

2015-04-16 Thread Christoffer Dall
On Thu, Apr 16, 2015 at 09:39:06PM +0200, Paolo Bonzini wrote: > > > 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 the

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. > > Unfortunat

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

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 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

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 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 > >> vi

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

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 commi

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

2015-03-17 Thread Stephen Rothwell
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 71760950bf3d ("arm/arm64: KVM: add a common vgic_queue_irq_to_lr fn") from the kvm-arm

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

2014-10-16 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in virt/kvm/arm/vgic-v2.c between commit 1f2bb4acc125 ("arm/arm64: KVM: Fix unaligned access bug on gicv2 access") from Linus' tree and commit 2df36a5dd679 ("arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs") from the

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

2014-07-31 Thread Stephen Rothwell
Hi Christoffer, On Thu, 31 Jul 2014 16:23:47 +0200 Christoffer Dall wrote: > > Stephen, did you pick up the resolution provided by Marc for the gicv2 > fix patch so that it applies to tomorrow's next/kvmarm merge? Yes, I have. You will need to produce the same for Linus eventually, or do the m

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

2014-07-31 Thread Marc Zyngier
On Thu, Jul 31 2014 at 03:23:47 PM, Christoffer Dall wrote: > On Thu, Jul 31, 2014 at 01:15:40PM +0100, Marc Zyngier wrote: >> On Thu, Jul 31 2014 at 12:53:03 pm BST, Christoffer Dall >> wrote: >> >> Hi Christoffer, >> >> > On Thu, Jul 31, 2014 at 8:30 AM, Stephen Rothwell >> > wrote: >> > >>

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

2014-07-31 Thread Christoffer Dall
On Thu, Jul 31, 2014 at 01:15:40PM +0100, Marc Zyngier wrote: > On Thu, Jul 31 2014 at 12:53:03 pm BST, Christoffer Dall > wrote: > > Hi Christoffer, > > > On Thu, Jul 31, 2014 at 8:30 AM, Stephen Rothwell > > wrote: > > > > Hi all, > > > > Today's linux-next merge of the kvm-arm

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

2014-07-31 Thread Stephen Rothwell
Hi all, On Thu, 31 Jul 2014 22:17:52 +1000 Stephen Rothwell wrote: > > Just send me a patch relative to today's linux-next (or merge > 338eeb9b8318) and I will add it when I merge the kvm-arm tree on > Monday. And don't forget to tell Linus :-) ^^ Actually, "tomorrow". I forgot what day

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

2014-07-31 Thread Stephen Rothwell
Hi Christoffer, On Thu, 31 Jul 2014 13:53:03 +0200 Christoffer Dall wrote: > > On Thu, Jul 31, 2014 at 8:30 AM, Stephen Rothwell > wrote: > > > Today's linux-next merge of the kvm-arm tree got a conflict in > > virt/kvm/arm/vgic.c between commit 63afbe7a0ac1 ("kvm: arm64: vgic: fix > > hyp pan

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

2014-07-31 Thread Marc Zyngier
On Thu, Jul 31 2014 at 12:53:03 pm BST, Christoffer Dall wrote: Hi Christoffer, > On Thu, Jul 31, 2014 at 8:30 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 63afbe7a0ac1 ("kvm:

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

2014-07-31 Thread Marc Zyngier
On Thu, Jul 31 2014 at 7:30:04 am BST, Stephen Rothwell wrote: Hi Stephen, > Today's linux-next merge of the kvm-arm tree got a conflict in > virt/kvm/arm/vgic.c between commit 63afbe7a0ac1 ("kvm: arm64: vgic: fix > hyp panic with 64k pages on juno platform") from Linus' tree and commit > 8f18

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

2014-07-30 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in virt/kvm/arm/vgic.c between commit 63afbe7a0ac1 ("kvm: arm64: vgic: fix hyp panic with 64k pages on juno platform") from Linus' tree and commit 8f186d522c69 ("KVM: ARM: vgic: split GICv2 backend from the main vgic code") and ot