[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL] Update OpenBIOS images
From: |
Peter Maydell |
Subject: |
Re: [Qemu-devel] [PULL] Update OpenBIOS images |
Date: |
Thu, 19 Oct 2017 19:18:27 +0100 |
On 19 October 2017 at 08:10, Mark Cave-Ayland
<address@hidden> wrote:
> Hi Peter,
>
> Here are the latest set of updates for OpenBIOS which should be pulled after
> the sun4u
> patches have been applied due to breaking changes in the sun4u machine.
>
>
> ATB,
>
> Mark.
>
>
> The following changes since commit 861cd431c99e56ddb5953ca1da164a9c32b477ca:
>
> Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20171017'
> into staging (2017-10-17 15:26:51 +0100)
>
> are available in the git repository at:
>
>
> https://github.com/mcayland/qemu.git tags/qemu-openbios-signed
>
> for you to fetch changes up to 08e2c1854d8bc32b3b6fcefbead0ea808c44cbc8:
>
> Update OpenBIOS images to 83818bd built from submodule. (2017-10-19
> 08:04:15 +0100)
>
> ----------------------------------------------------------------
> Update OpenBIOS images
>
> ----------------------------------------------------------------
> Mark Cave-Ayland (1):
> Update OpenBIOS images to 83818bd built from submodule.
>
> pc-bios/openbios-ppc | Bin 754936 -> 754936 bytes
> pc-bios/openbios-sparc32 | Bin 382048 -> 382048 bytes
> pc-bios/openbios-sparc64 | Bin 1593408 -> 1593408 bytes
> roms/openbios | 2 +-
This fails to merge, because your other pullreq also
updated pc-bios/openbios-sparc64 and git can't automatically
resolve merge conflicts between binary files.
If you tell me which version of the binary to prefer I can
fix it up by hand in the merge commit I guess.
thanks
-- PMM