Re: [Qemu-devel] [PULL 00/31] Trivial patches for 2017-01-24

[Peter Maydell <peter.maydell@linaro.org>]

On 24 January 2017 at 09:39, Michael Tokarev <mjt@tls.msk.ru> wrote:
> Hi!
> This is a next trivial-patches pull request after a long while.
> We had a new release (2.8), new year holidays and other stuff.
> So here we go now with whatever has been collected so far.
>
> Please consider applying.
>
> Thanks,
>
> /mjt
>
> The following changes since commit 3879284d6517dc22529395bdb259f4183b589127:
>
>   Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-01-23-2' into staging (2017-01-23 15:59:09 +0000)
>
> are available in the git repository at:
>
>   git://git.corpit.ru/qemu.git tags/trivial-patches-fetch
>
> for you to fetch changes up to bed534dd4032446750ad3e7a806c24d81bc5851b:
>
>   hw/isa/isa-bus: Set category of the "isabus-bridge" device (2017-01-24 12:38:03 +0300)
>
> ----------------------------------------------------------------
> trivial patches for 2017-01-24
>
> ----------------------------------------------------------------

This failed to build, all targets:

/home/petmay01/linaro/qemu-for-merges/arch_init.c:95:5: error: no
previous prototype for ‘qemu_read_default_config_files’
[-Werror=missing-prototypes]

I suspect this may be the result of merge conflicts getting
wrongly resolved -- can you rebase and resend, please?

thanks
-- PMM