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

2021-04-13 Thread Ard Biesheuvel
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

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

2020-12-04 Thread Marc Zyngier
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

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

2018-08-17 Thread Marc Zyngier
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 > >> > >> -

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

2018-08-17 Thread Paolo Bonzini
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

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

2018-08-15 Thread Stephen Rothwell
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: >

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

2018-07-23 Thread Marc Zyngier
-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

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

2018-06-01 Thread Marc Zyngier
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")

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

2018-03-28 Thread Stephen Rothwell
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 (

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

2018-03-28 Thread Will Deacon
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")

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

2017-08-25 Thread Christoffer Dall
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

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

2017-08-25 Thread Marc Zyngier
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

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

2016-02-22 Thread Catalin Marinas
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

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

2016-02-22 Thread Catalin Marinas
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

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

2015-01-23 Thread Christoffer Dall
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

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

2015-01-22 Thread Wei Huang
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

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

2015-01-22 Thread Stephen Rothwell
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

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

2015-01-22 Thread Mark Rutland
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

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

2015-01-22 Thread Marc Zyngier
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