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

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

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

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: fpsimd: run kernel mode NEON with softirqs disabled") from the arm64

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/include/asm/kvm_asm.h between commit: 7001d4af926b ("arm64: Drop workaround for broken 'S' constraint with GCC 4.9") from the arm64 tree and commit: 247bc166e6b3 ("KVM: arm64: Remove hyp_symbol_addr")

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

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

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

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 PSTATE") from the arm64 tree and commit: 9c322020286c

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/include/asm/cpucaps.h between commit: 364a5a8ae8dc ("arm64: cpufeatures: Add capability for LDAPR instruction") from the arm64 tree and commit: 44e88d43c442 ("KVM: arm64: Add ARM64_KVM_PROTECTED_MODE CPU

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/kvm/hyp/Makefile between commit: 5359a87d5bda ("KVM: arm64: Replace CONFIG_KVM_INDIRECT_VECTORS with CONFIG_RANDOMIZE_BASE") 9ef2b48be9bb ("KVM: arm64: Allow patching EL2 vectors even with KASLR is not

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/include/asm/ptrace.h between commit: 8ef8f360cf30 ("arm64: Basic Branch Target Identification support") from the arm64 tree and commit: d9d7d84d9906 ("KVM: arm64: Parametrize exception entry with a

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/include/asm/cpufeature.h between commit: 48ce8f80f590 ("arm64: irqflags: Introduce explicit debugging for IRQ priorities") from the arm64 tree and commit: c118bbb52743 ("arm64: KVM: Propagate full

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

Hi all, Today's linux-next merge of the kvm-arm tree got conflicts in: arch/arm/include/asm/kvm_mmu.h arch/arm64/include/asm/kvm_arm.h arch/arm64/include/asm/kvm_mmu.h between commit: ab510027dc4d ("arm64: KVM: Enable Common Not Private translations") from the arm64 tree and commit:

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

Hi all, Today's linux-next merge of the kvm-arm tree got conflicts in: arch/arm/include/asm/kvm_mmu.h arch/arm64/include/asm/kvm_arm.h arch/arm64/include/asm/kvm_mmu.h between commit: ab510027dc4d ("arm64: KVM: Enable Common Not Private translations") from the arm64 tree and commit:

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/include/asm/cpufeature.h between commit: 520ad98871a0 ("arm64/cpufeatures: Factorize emulate_mrs()") from the arm64 tree and commit: ce00e3cb4fb4 ("arm64: Add a helper for PARange to physical shift

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/include/asm/cpufeature.h between commit: 520ad98871a0 ("arm64/cpufeatures: Factorize emulate_mrs()") from the arm64 tree and commit: ce00e3cb4fb4 ("arm64: Add a helper for PARange to physical shift

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

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

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

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

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

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

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

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

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

-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

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

-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

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

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 the arm64 tree and commit: e48d53a91f6e ("arm64: KVM: Add support for Stage-2 control of memory types and

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

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 the arm64 tree and commit: e48d53a91f6e ("arm64: KVM: Add support for Stage-2 control of memory types and

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

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

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

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

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") from the arm64 tree and commits: fa89d31c5306 ("KVM: arm64:

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

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") from the arm64 tree and commits: fa89d31c5306 ("KVM: arm64:

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/include/asm/cpufeature.h between commits: a43ae4dfe56a ("arm64: Add 'ssbd' command-line option") c32e1736ca03 ("arm64: ssbd: Add global mitigation state accessor") 647d0519b53f ("arm64: ssbd: Restore

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/include/asm/cpufeature.h between commits: a43ae4dfe56a ("arm64: Add 'ssbd' command-line option") c32e1736ca03 ("arm64: ssbd: Add global mitigation state accessor") 647d0519b53f ("arm64: ssbd: Restore

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

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

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

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

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

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

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

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

Hi all, 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 ("arm64: cpufeature: Avoid warnings due to unused symbols") from the arm64

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

Hi all, 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 ("arm64: cpufeature: Avoid warnings due to unused symbols") from the arm64

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

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") followed by a series of patches cleaning up capabilities from the arm64 tree and commits:

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

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") followed by a series of patches cleaning up capabilities from the arm64 tree and commits:

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

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

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

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

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

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

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

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

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

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 arm64 tree and commit: c5511c3c068c ("KVM: arm/arm64: Fix guest external abort matching")

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

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 arm64 tree and commit: c5511c3c068c ("KVM: arm/arm64: Fix guest external abort matching")

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/include/asm/cpufeature.h between commit: 104a0c02e8b1 ("arm64: Add workaround for Cavium erratum 27456") from the arm64 tree and commit: d0be74f771d5 ("arm64: Add ARM64_HAS_VIRT_HOST_EXTN feature") from

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/include/asm/cpufeature.h between commit: 104a0c02e8b1 ("arm64: Add workaround for Cavium erratum 27456") from the arm64 tree and commit: d0be74f771d5 ("arm64: Add ARM64_HAS_VIRT_HOST_EXTN feature") from

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/include/asm/kvm_host.h between commit: a0bf9776cd0b ("arm64: kvm: deal with kernel symbols outside of linear mapping") from the arm64 tree and commit: 67aaab4cff18 ("arm64: KVM: Move __cpu_init_stage2

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm64/include/asm/kvm_host.h between commit: a0bf9776cd0b ("arm64: kvm: deal with kernel symbols outside of linear mapping") from the arm64 tree and commit: 67aaab4cff18 ("arm64: KVM: Move __cpu_init_stage2

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

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

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

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

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

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

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

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

Hi all, 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 commit: 253dcab4c363 ("arm64: KVM: VHE: Patch out use of HVC") from the

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

Hi all, 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 commit: 253dcab4c363 ("arm64: KVM: VHE: Patch out use of HVC") from the

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

Hi all, 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 pattern for CPUs without a prefetcher") 57f4959bad0a ("arm64: kernel: Add support

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

Hi all, 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 pattern for CPUs without a prefetcher") 57f4959bad0a ("arm64: kernel: Add support

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm/kvm/arm.c between commit: 6a26b548a2c4 ("arm64: kvm: deal with kernel symbols outside of linear mapping") from the arm64 tree and commit: aa0bf2030bca ("ARM: KVM: Remove

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in: arch/arm/kvm/arm.c between commit: 6a26b548a2c4 ("arm64: kvm: deal with kernel symbols outside of linear mapping") from the arm64 tree and commit: aa0bf2030bca ("ARM: KVM: Remove

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

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

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

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 s...@canb.auug.org.au 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

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

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

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

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

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

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

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

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

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

On Thu, Jan 22 2015 at 5:07:04 am GMT, Stephen Rothwell s...@canb.auug.org.au 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

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

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 s...@canb.auug.org.au 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

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

Hi Mark, On Thu, 22 Jan 2015 10:29:20 + Mark Rutland mark.rutl...@arm.com 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 s...@canb.auug.org.au wrote: Today's linux-next merge of the kvm-arm tree got a

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

On 01/22/2015 02:51 AM, Marc Zyngier wrote: On Thu, Jan 22 2015 at 5:07:04 am GMT, Stephen Rothwell s...@canb.auug.org.au 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

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

Hi all, 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 ("arm/arm64: KVM: add tracing support for arm64 exit handler") from the kvm-arm

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in arch/arm64/kvm/handle_exit.c between commit c6d01a947a51 ("arm64: kvm: move to ESR_ELx macros") from the arm64 tree and commit 0d97f8848104 ("arm/arm64: KVM: add tracing support for arm64 exit handler") from the kvm-arm tree.

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

Hi all, Today's linux-next merge of the kvm-arm tree got a conflict in arch/arm64/kvm/handle_exit.c between commit c6d01a947a51 (arm64: kvm: move to ESR_ELx macros) from the arm64 tree and commit 0d97f8848104 (arm/arm64: KVM: add tracing support for arm64 exit handler) from the kvm-arm tree. I

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

Hi all, 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 (arm/arm64: KVM: add tracing support for arm64 exit handler) from the kvm-arm tree.