> -----Original Message----- > From: Stephen Rothwell [mailto:sfr@xxxxxxxxxxxxxxxx] > Sent: Friday, October 16, 2015 11:53 AM > To: Christoffer Dall <cdall@xxxxxxxxxxxxxxx>; Marc Zyngier > <marc.zyngier@xxxxxxx>; Marcelo Tosatti <mtosatti@xxxxxxxxxx>; Gleb > Natapov <gleb@xxxxxxxxxx>; kvm@xxxxxxxxxxxxxxx > Cc: linux-next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; Wu, Feng > <feng.wu@xxxxxxxxx>; Paolo Bonzini <pbonzini@xxxxxxxxxx>; Christian > Borntraeger <borntraeger@xxxxxxxxxx>; Cornelia Huck > <cornelia.huck@xxxxxxxxxx> > Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Thanks Stephen! Thanks, Feng -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
