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

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

linux-next: manual merge of the kvm-arm tree with the tip 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.

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

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 suppor

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

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