> -----Original Message----- > From: Stephen Rothwell [mailto:s...@canb.auug.org.au] > Sent: Friday, October 16, 2015 11:53 AM > To: Christoffer Dall <cd...@cs.columbia.edu>; Marc Zyngier > <marc.zyng...@arm.com>; Marcelo Tosatti <mtosa...@redhat.com>; Gleb > Natapov <g...@kernel.org>; k...@vger.kernel.org > Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org; Wu, Feng > <feng...@intel.com>; Paolo Bonzini <pbonz...@redhat.com>; Christian > Borntraeger <borntrae...@de.ibm.com>; Cornelia Huck > <cornelia.h...@de.ibm.com> > 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-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
