lkml.org 
[lkml]   [2013]   [Feb]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] KVM updates for the 3.9 merge window
On Sun, 24 Feb 2013 16:05:31 -0800
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Wed, Feb 20, 2013 at 5:17 PM, Marcelo Tosatti <mtosatti@redhat.com> 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.



\
 
 \ /
  Last update: 2013-02-25 13:01    [W:0.045 / U:0.432 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site