Re: [Qemu-devel] [PATCH v4] glib: fix g_poll early timeout on windows

[Michael Tokarev]

07.05.2014 16:36, Stanislav Vorobiov wrote:
> Hi,
> 
> IMHO it's not a problem, automerge will resolve this

Now the trivial queue pull request has been processed, some
of this patch is in the tree.  I don't know what is this
magic "automerge" which you're talking about.  The thing
is that your code is a bit different (for one, it wraps
g_poll() definition in glib-compat.h into #ifdef WIN32,
for another it adds g_poll_fixed()), and the patch
does not apply anymore.

I'd suggest you to rebase and resubmit.  Hopefully it wont
clash with further glib-compat additions which are on the
way.

Thank you!

/mjt