Il 20/01/2014 15:44, Paolo Bonzini ha scritto: > Anthony, > > the following changes since commit 6747f6456fd1e5e986b6385ff5d706c79ebd8a32: > > Merge remote-tracking branch 'rth/tcg-temp-order' into staging (2013-12-10 > 16:14:36 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git uq/master > > for you to fetch changes up to 584f2be79de148b0765a758ac0c1036a29c5e830: > > kvm: always update the MPX model specific register (2014-01-20 14:25:22 > +0100) > > Many small bug fixes, and the userspace side of MPX support.
There is a trivial conflict in the include files of exec.c. Upstream already includes the header that is added in this series. Paolo
