On Tue, 13 Apr 2021 at 07:43, Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/include/asm/assembler.h
>
> between commits:
>
> 27248fe1abb2 ("arm64: assembler: remove conditional NEON yield macros")
> 13150149aa6d ("arm64
Hi Stephen,
On 2020-12-04 05:44, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
arch/arm64/kernel/head.S
between commits:
2ffac9e3fdbd ("arm64: head.S: cleanup SCTLR_ELx initialization")
d87a8e65b510 ("arm64: head.S: always initialize PS
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
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
On Fri, 17 Aug 2018 09:32:55 +0100,
Paolo Bonzini wrote:
>
> On 16/08/2018 02:15, Stephen Rothwell wrote:
> >> -#define ARM64_HAS_STAGE2_FWB 31
> >> +#define ARM64_MISMATCHED_CACHE_TYPE 31
> >> ++#define ARM64_HAS_STAGE2_FWB 32
> >>
> >> -
On 16/08/2018 02:15, Stephen Rothwell wrote:
>> -#define ARM64_HAS_STAGE2_FWB 31
>> +#define ARM64_MISMATCHED_CACHE_TYPE31
>> ++#define ARM64_HAS_STAGE2_FWB 32
>>
>> --#define ARM64_NCAPS32
>> ++#define
Hi all,
On Mon, 23 Jul 2018 14:46:41 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/include/asm/cpucaps.h
>
> between commit:
>
> 314d53d29798 ("arm64: Handle mismatched cache type")
>
> from the arm64 tree and commit:
>
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
On 23/07/18 05:46, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/include/asm/cpucaps.h
>
> between commit:
>
> 314d53d29798 ("arm64: Handle mismatched cache type")
>
> from t
Hi Stephen,
On 01/06/18 07:23, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-arm tree got conflicts in:
>
> arch/arm64/include/asm/kvm_host.h arch/arm64/kvm/hyp/switch.c
>
> between commit:
>
> 55e3748e8902 ("arm64: KVM: Add ARCH_WORKAROUND_2 support for
> guests")
Hi all,
On Wed, 28 Mar 2018 16:05:41 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/kernel/cpufeature.c
>
> between commits:
>
> 143ba05d867a ("arm64: capabilities: Prepare for fine grained capabilities")
> 12eb369125ab (
Hi Stephen,
On Wed, Mar 28, 2018 at 04:00:34PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/kernel/cpu_errata.c
>
> between commit:
>
> c0cda3b8ee6b ("arm64: capabilities: Update prototype for enable call back")
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
On Fri, Aug 25, 2017 at 10:11 AM, Marc Zyngier wrote:
> Hi Stephen,
>
> On Fri, Aug 25 2017 at 2:57:21 pm BST, Stephen Rothwell
> wrote:
>> Hi all,
>>
>> Today's linux-next merge of the kvm-arm tree got a conflict in:
>>
>> arch/arm64/include/asm/esr.h
>>
>> between commit:
>>
>> 1f9b8936f3
Hi Stephen,
On Fri, Aug 25 2017 at 2:57:21 pm BST, Stephen Rothwell
wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/include/asm/esr.h
>
> between commit:
>
> 1f9b8936f36f ("arm64: Decode information from ESR upon mem faults")
>
> from the
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
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
On Mon, Feb 22, 2016 at 01:33:22PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/kvm/hyp.S
>
> between commit:
>
> a0bf9776cd0b ("arm64: kvm: deal with kernel symbols outside of linear
> mapping")
>
> from the arm64 tree and
Hi Stephen,
On Mon, Feb 22, 2016 at 01:28:29PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the kvm-arm tree got a conflict in:
>
> arch/arm64/include/asm/cpufeature.h
> arch/arm64/kernel/cpufeature.c
>
> between commit:
>
> d5370f754875 ("arm64: prefetch: add alternative
> -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
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
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
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
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
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
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
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
On Thu, Jan 22, 2015 at 08:51:54AM +, Marc Zyngier wrote:
> On Thu, Jan 22 2015 at 5:07:04 am GMT, Stephen Rothwell
> wrote:
>
> Hi Stephen,
>
> > Today's linux-next merge of the kvm-arm tree got a conflict in
> > arch/arm64/include/asm/kvm_arm.h between commit 6e53031ed840 ("arm64:
> > kv
On 01/22/2015 02:51 AM, Marc Zyngier wrote:
> On Thu, Jan 22 2015 at 5:07:04 am GMT, Stephen Rothwell
> wrote:
>
> Hi Stephen,
>
>> Today's linux-next merge of the kvm-arm tree got a conflict in
>> arch/arm64/include/asm/kvm_arm.h between commit 6e53031ed840 ("arm64:
>> kvm: remove ESR_EL2_* m
Hi Mark,
On Thu, 22 Jan 2015 10:29:20 + Mark Rutland wrote:
>
> On Thu, Jan 22, 2015 at 08:51:54AM +, Marc Zyngier wrote:
> > On Thu, Jan 22 2015 at 5:07:04 am GMT, Stephen Rothwell
> > wrote:
> >
> > > Today's linux-next merge of the kvm-arm tree got a conflict in
> > > arch/arm64/in
On Thu, Jan 22, 2015 at 08:51:54AM +, Marc Zyngier wrote:
> On Thu, Jan 22 2015 at 5:07:04 am GMT, Stephen Rothwell
> wrote:
>
> Hi Stephen,
>
> > Today's linux-next merge of the kvm-arm tree got a conflict in
> > arch/arm64/include/asm/kvm_arm.h between commit 6e53031ed840 ("arm64:
> > kv
On Thu, Jan 22 2015 at 5:07:04 am GMT, Stephen Rothwell
wrote:
Hi Stephen,
> Today's linux-next merge of the kvm-arm tree got a conflict in
> arch/arm64/include/asm/kvm_arm.h between commit 6e53031ed840 ("arm64:
> kvm: remove ESR_EL2_* macros") from the arm64 tree and commit
> 0d97f8848104 ("a
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
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
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
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:
>> >
>>
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
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
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
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:
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
On 25/10/13 14:03, Thierry Reding wrote:
> Today's linux-next merge of the kvm-arm tree got a conflict in
>
> arch/arm/kvm/reset.c
>
> caused by commits e8c2d99 (KVM: ARM: Add support for Cortex-A7) and 7999b4d
> (ARM: KVM: drop limitation to 4 CPU VMs).
>
> I fixed it up (see below). Plea
On 17 October 2013 07:55, Gleb Natapov wrote:
> On Wed, Oct 16, 2013 at 12:02:08PM -0700, Christoffer Dall wrote:
>> On 16 October 2013 11:58, Marc Zyngier wrote:
>> > On 16/10/13 19:51, Thierry Reding wrote:
>> >> Today's linux-next merge of the kvm-arm tree got conflicts in
>> >>
>> >> ar
On Wed, Oct 16, 2013 at 12:02:08PM -0700, Christoffer Dall wrote:
> On 16 October 2013 11:58, Marc Zyngier wrote:
> > On 16/10/13 19:51, Thierry Reding wrote:
> >> Today's linux-next merge of the kvm-arm tree got conflicts in
> >>
> >> arch/arm/kvm/reset.c
> >>
> >> caused by commits e8c2d99
On 16 October 2013 12:04, Thierry Reding wrote:
> On Wed, Oct 16, 2013 at 12:02:08PM -0700, Christoffer Dall wrote:
>> On 16 October 2013 11:58, Marc Zyngier wrote:
>> > On 16/10/13 19:51, Thierry Reding wrote:
>> >> Today's linux-next merge of the kvm-arm tree got conflicts in
>> >>
>> >>
On Wed, Oct 16, 2013 at 12:02:08PM -0700, Christoffer Dall wrote:
> On 16 October 2013 11:58, Marc Zyngier wrote:
> > On 16/10/13 19:51, Thierry Reding wrote:
> >> Today's linux-next merge of the kvm-arm tree got conflicts in
> >>
> >> arch/arm/kvm/reset.c
> >>
> >> caused by commits e8c2d99
On 16 October 2013 11:58, Marc Zyngier wrote:
> On 16/10/13 19:51, Thierry Reding wrote:
>> Today's linux-next merge of the kvm-arm tree got conflicts in
>>
>> arch/arm/kvm/reset.c
>>
>> caused by commits e8c2d99 (KVM: ARM: Add support for Cortex-A7) and ac570e0
>> (ARM: kvm: rename cpu_rese
On 16/10/13 19:51, Thierry Reding wrote:
> Today's linux-next merge of the kvm-arm tree got conflicts in
>
> arch/arm/kvm/reset.c
>
> caused by commits e8c2d99 (KVM: ARM: Add support for Cortex-A7) and ac570e0
> (ARM: kvm: rename cpu_reset to avoid name clash).
>
> I've fixed them up (see
47 matches
Mail list logo
