Re: linux-next: manual merge of the kvm-arm tree with the kvm tree
From: Marc Zyngier <hidden>
Date: 2014-09-18 15:13:25
Also in:
lkml
Possibly related (same subject, not in this thread)
- 2023-04-06 · linux-next: manual merge of the kvm-arm tree with the kvm tree · Stephen Rothwell <hidden>
- 2023-03-31 · linux-next: manual merge of the kvm-arm tree with the kvm tree · Stephen Rothwell <hidden>
- 2022-12-01 · Re: linux-next: manual merge of the kvm-arm tree with the kvm tree · Marc Zyngier <maz@kernel.org>
- 2022-12-01 · linux-next: manual merge of the kvm-arm tree with the kvm tree · Stephen Rothwell <hidden>
- 2022-12-01 · linux-next: manual merge of the kvm-arm tree with the kvm tree · Stephen Rothwell <hidden>
On Thu, Sep 18 2014 at 04:52:26 AM, Stephen Rothwell [off-list ref] 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: vgic: declare probe function pointer as const")
from the kvm-arm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).Looks good, thanks Stephen. M. -- Jazz is not dead. It just smells funny.