From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiJYG-00056H-VQ for qemu-devel@nongnu.org; Thu, 08 May 2014 04:19:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WiJYA-00035G-Qb for qemu-devel@nongnu.org; Thu, 08 May 2014 04:19:36 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:48735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WiJYA-000355-JX for qemu-devel@nongnu.org; Thu, 08 May 2014 04:19:30 -0400 Message-ID: <536B3E11.5090206@msgid.tls.msk.ru> Date: Thu, 08 May 2014 12:19:29 +0400 From: Michael Tokarev MIME-Version: 1.0 References: <1399453649-3514-1-git-send-email-s.vorobiov@samsung.com> <536A254E.5040807@msgid.tls.msk.ru> <536A28CF.6030101@samsung.com> In-Reply-To: <536A28CF.6030101@samsung.com> Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4] glib: fix g_poll early timeout on windows List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stanislav Vorobiov , qemu-devel@nongnu.org Cc: alex@alex.org.uk, sw@weilnetz.de, sangho1206.park@samsung.com, stefanha@redhat.com, syeon.hwang@samsung.com, pbonzini@redhat.com 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