[lkml]   [2012]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: [GIT PULL] KVM updates for the 3.6 merge window
    On Tue, 2012-07-24 at 12:04 -0700, Linus Torvalds wrote:
    > Ok, this caused conflicts with the s390 and ppc trees. I think I fixed
    > them correctly, but the respective arch people really should take a
    > look.

    A quick peek at the merge commit looks allright, but Alex mentioned that
    there's some more fallover that needs an actual patch to fix (the
    changes to enforce a cleaner ASM syntax need to be applied to some new
    code from Avi's tree that didn't actually trigger merge conflicts).

    I'll follow up with Alex and send you the relevant patches if any.


    > Linus
    > On Mon, Jul 23, 2012 at 2:12 AM, Avi Kivity <> wrote:
    > > Linus, please pull from the repo and tag at:
    > >
    > > git:// tags/kvm-3.6-1
    > >
    > > to merge the KVM updates for the 3.5 merge window.
    > --
    > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    > the body of a message to
    > More majordomo info at
    > Please read the FAQ at

     \ /
      Last update: 2012-07-25 01:21    [W:0.022 / U:6.840 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site