Re: [Qemu-devel] [PULL 00/77] Misc patches for 2019-02-04

[Peter Maydell]

On Tue, 5 Feb 2019 at 11:27, Paolo Bonzini <address@hidden> wrote:
>
> On 05/02/19 10:35, Peter Maydell wrote:
> > On Mon, 4 Feb 2019 at 18:38, Paolo Bonzini <address@hidden> wrote:
> >>
> >> The following changes since commit 
> >> 773c4a6228fd910556cee2d477ee56c591a30000:
> >>
> >>   test-filter-mirror: pass UNIX domain socket through fd (2019-02-04 
> >> 16:03:20 +0000)
> >>
> >> are available in the git repository at:
> >>
> >>   git://github.com/bonzini/qemu.git tags/for-upstream
> >
> > Hi; my script says:
> > error: remotes/bonzini/tags/for-upstream: cannot verify a non-tag
> > object of type commit.
> > Does not appear to be a signed tag
> >
> > Did something go wrong at your end?
>
> Hmm this is a first.  Repushed now.

I get this conflict in default-configs/lm32-softmmu.mak that I don't
know how to resolve:

<<<<<<< HEAD
CONFIG_MILKYMIST_TMU2=$(call land,$(CONFIG_X11),$(CONFIG_OPENGL))
CONFIG_FRAMEBUFFER=y
CONFIG_PTIMER=y
CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y
CONFIG_SD=y
=======
>>>>>>> remotes/bonzini/tags/for-upstream

Your patches remove the CONFIG_MILKYMIST_TMU2 line entirely
so I don't know how to add the change that commit 57d434407adc967a696d
makes to make the symbol depend on both CONFIG_X11 and CONFIG_OPENGL
rather than only on CONFIG_OPENGL.

Please can you rebase and resend?

thanks
-- PMM