On Sun, 24 Feb 2013 16:05:31 -0800 Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > On Wed, Feb 20, 2013 at 5:17 PM, Marcelo Tosatti <mtosatti@xxxxxxxxxx> wrote: > > > > Please pull from > > > > git://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/kvm-3.9-1 > > > > to receive the KVM updates for the 3.9 merge window [..] > > Ok, particularly the s390 people should check me resolution of the > conflicts, since they include the renaming of IOINT_VIR to IRQIO_VIR. > But the uapi header file move should be couble-checked by people who > use this too. The IRQIO_VIR is now at the end of the IRQIO_xxx entries while we had it between the IRQIO_CSC and the IRQIO_PCI entry. No worry, we just change our code and use the upstream version. Just completed the double-check and pushed my branches to the linux-s390 tree. The code is in sync. -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
