On Thu, Oct 31, 2013 at 3:18 PM, Andreas Färber <afaer...@suse.de> wrote: > Hi, > > Am 31.10.2013 15:02, schrieb Edgar E. Iglesias: >> On Fri, Oct 25, 2013 at 07:07:23PM +0100, Peter Maydell wrote: >>> The following changes since commit fc8ead74674b7129e8f31c2595c76658e5622197: >>> >>> Merge remote-tracking branch 'qemu-kvm/uq/master' into staging >>> (2013-10-18 10:03:24 -0700) >>> >>> are available in the git repository at: >>> >>> >>> git://git.linaro.org/people/pmaydell/qemu-arm.git >>> tags/pull-target-arm-20131025 >>> >>> for you to fetch changes up to 71c903cc3b78fc563122fe40c5cadd050068b91a: >>> >>> integrator: fix Linux boot failure by emulating dbg region (2013-10-25 >>> 18:27:07 +0100) >> >> >> Applied, thanks all. > > Edgar, there is no merge commit in qemu.git despite this being a signed > pull. Do you maybe need to upgrade your version of git?
Need to add: [merge] ff = false To your git config to prevent fast forwards on merging. Regards, Anthony Liguori > Peter, since I had picked up the first two patches into my still pending > qom-next pull, as per the QEMU Summit discussion those patches should've > gotten an Acked-by. > > Regards, > Andreas > > -- > SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany > GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg >
