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
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
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")
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
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
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
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
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
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'
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
arch/arm64/kvm/mmu.c
between commit:
b757b47a2fcb ("KVM: arm64: Don't inherit exec permission across page-table
levels")
from the kvm-fixes tree and commit:
a0e50aa3f4a8 ("KVM: arm64: Factor out stage 2 page table
Hi all,
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 and commit:
a0e50aa3f4a8 ("KVM: arm64: Factor out stage 2 page table data from
Hi all,
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' parameters")
from the kvm tree and commits:
6b33e0d64f85 ("KVM: arm64: Drop
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
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
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
arch/arm/include/asm/kvm_host.h
between commit:
358b28f09f0a ("arm/arm64: KVM: Allow a VCPU to fully reset itself")
from the kvm-fixes tree and commit:
42a2502ef5f8 ("arm/arm64: KVM: Statically configure the host's
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
include/uapi/linux/kvm.h
between commits:
214ff83d4473 ("KVM: x86: hyperv: implement PV IPI send hypercalls")
0804c849f1df ("kvm/x86 : add coalesced pio support")
57b119da3594 ("KVM: nVMX: add
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
include/uapi/linux/kvm.h
between commits:
214ff83d4473 ("KVM: x86: hyperv: implement PV IPI send hypercalls")
0804c849f1df ("kvm/x86 : add coalesced pio support")
57b119da3594 ("KVM: nVMX: add
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:
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:
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
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
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 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
>>
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
>>
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:
>
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
-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
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
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
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 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,
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:
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:
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
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
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
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
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
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
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
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:
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:
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
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
>
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
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
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
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
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
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
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:
>>
>>
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:
>>
>>
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
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 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")
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")
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
Documentation/arm64/silicon-errata.txt
between commits:
e5b829de053d ("iommu/arm-smmu-v3: Add workaround for Cavium ThunderX2 erratum
#74")
f935448acf46 ("iommu/arm-smmu-v3: Add workaround for Cavium ThunderX2
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
Documentation/arm64/silicon-errata.txt
between commits:
e5b829de053d ("iommu/arm-smmu-v3: Add workaround for Cavium ThunderX2 erratum
#74")
f935448acf46 ("iommu/arm-smmu-v3: Add workaround for Cavium ThunderX2
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
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
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
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
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
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
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 capabilities")
578fd61d2d21 ("KVM: MIPS: Add 64BIT capability")
from the kvm tree and commit:
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 capabilities")
578fd61d2d21 ("KVM: MIPS: Add 64BIT capability")
from the kvm tree and commit:
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
arch/arm/include/asm/arch_gicv3.h
between commit:
91ef84428a86 ("irqchip/gic-v3: Reset BPR during initialization")
from the tip tree and commit:
3d9cd95f90b2 ("ARM: gic-v3: Work around definition of
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
arch/arm/include/asm/arch_gicv3.h
between commit:
91ef84428a86 ("irqchip/gic-v3: Reset BPR during initialization")
from the tip tree and commit:
3d9cd95f90b2 ("ARM: gic-v3: Work around definition of
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
virt/kvm/irqchip.c
between commit:
c63cf538eb4b ("KVM: pass struct kvm to kvm_set_routing_entry")
from the kvm tree and commit:
995a0ee9809b ("KVM: arm/arm64: Enable MSI routing")
from the kvm-arm tree.
I fixed
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
virt/kvm/irqchip.c
between commit:
c63cf538eb4b ("KVM: pass struct kvm to kvm_set_routing_entry")
from the kvm tree and commit:
995a0ee9809b ("KVM: arm/arm64: Enable MSI routing")
from the kvm-arm tree.
I fixed
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
Documentation/virtual/kvm/api.txt
between commit:
3713131345fb ("KVM: x86: add KVM_CAP_X2APIC_API")
from the kvm tree and commit:
76a10b86785c ("KVM: api: Pass the devid in the msi routing entry")
from the kvm-arm
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
Documentation/virtual/kvm/api.txt
between commit:
3713131345fb ("KVM: x86: add KVM_CAP_X2APIC_API")
from the kvm tree and commit:
76a10b86785c ("KVM: api: Pass the devid in the msi routing entry")
from the kvm-arm
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
virt/kvm/kvm_main.c
between commit:
8c18b2d2d088 ("virt: Convert kvm hotplug to state machine")
from the tip tree and commit:
8a39d00670f0 ("KVM: kvm_io_bus: Add kvm_io_bus_get_dev() call")
from the kvm-arm tree.
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
virt/kvm/kvm_main.c
between commit:
8c18b2d2d088 ("virt: Convert kvm hotplug to state machine")
from the tip tree and commit:
8a39d00670f0 ("KVM: kvm_io_bus: Add kvm_io_bus_get_dev() call")
from the kvm-arm tree.
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
include/uapi/linux/kvm.h
between commit:
3713131345fb ("KVM: x86: add KVM_CAP_X2APIC_API")
from the kvm tree and commit:
2b8ddd9337ee ("KVM: Extend struct kvm_msi to hold a 32-bit device ID")
from the kvm-arm
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
include/uapi/linux/kvm.h
between commit:
3713131345fb ("KVM: x86: add KVM_CAP_X2APIC_API")
from the kvm tree and commit:
2b8ddd9337ee ("KVM: Extend struct kvm_msi to hold a 32-bit device ID")
from the kvm-arm
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
include/linux/irqchip/arm-gic-v3.h
between commits:
9347359ad0ae ("irqchip/gicv3-its: Split its_alloc_tables() into two
functions")
3faf24ea894a ("irqchip/gicv3-its: Implement two-level(indirect) device table
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
include/linux/irqchip/arm-gic-v3.h
between commits:
9347359ad0ae ("irqchip/gicv3-its: Split its_alloc_tables() into two
functions")
3faf24ea894a ("irqchip/gicv3-its: Implement two-level(indirect) device table
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
virt/kvm/arm/vgic.c
between commit:
42ec50b5f257 ("arm/kvm/vgic: Convert to hotplug state machine")
from the tip tree and commit:
50926d82fa27 ("KVM: arm/arm64: The GIC is dead, long live the GIC")
from the
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
virt/kvm/arm/vgic.c
between commit:
42ec50b5f257 ("arm/kvm/vgic: Convert to hotplug state machine")
from the tip tree and commit:
50926d82fa27 ("KVM: arm/arm64: The GIC is dead, long live the GIC")
from the
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
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
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
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
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
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
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
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
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
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
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
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
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
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
l@vger.kernel.org; Wu, Feng
> ; Paolo Bonzini ; Christian
> Borntraeger ; Cornelia Huck
>
> Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks Stephen!
Tha
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
arch/x86/include/asm/kvm_host.h
between commit:
d84f1e0755ba ("KVM: make kvm_set_msi_irq() public")
from the kvm tree and commits:
8feb4a04dc75 ("KVM: Define a new interface kvm_intr_is_single_vcpu()")
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
arch/x86/include/asm/kvm_host.h
between commit:
d84f1e0755ba ("KVM: make kvm_set_msi_irq() public")
from the kvm tree and commits:
8feb4a04dc75 ("KVM: Define a new interface kvm_intr_is_single_vcpu()")
1 - 100 of 183 matches
Mail list logo