Messages in this thread | | | From | Marc Zyngier <> | Subject | Re: linux-next: manual merge of the kvm-arm tree with the kvm tree | Date | Thu, 18 Sep 2014 16:13:09 +0100 |
| |
On Thu, Sep 18 2014 at 04:52:26 AM, Stephen Rothwell <sfr@canb.auug.org.au> 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.
| |