From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi15X-000240-MH for qemu-devel@nongnu.org; Wed, 07 May 2014 08:36:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wi15Q-00049r-OS for qemu-devel@nongnu.org; Wed, 07 May 2014 08:36:43 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:37386) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi15Q-00049a-HX for qemu-devel@nongnu.org; Wed, 07 May 2014 08:36:36 -0400 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N5700E15F0UIH40@mailout4.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 07 May 2014 13:36:30 +0100 (BST) Message-id: <536A28CF.6030101@samsung.com> Date: Wed, 07 May 2014 16:36:31 +0400 From: Stanislav Vorobiov MIME-version: 1.0 References: <1399453649-3514-1-git-send-email-s.vorobiov@samsung.com> <536A254E.5040807@msgid.tls.msk.ru> In-reply-to: <536A254E.5040807@msgid.tls.msk.ru> 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: Michael Tokarev , 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 Hi, IMHO it's not a problem, automerge will resolve this On 05/07/2014 04:21 PM, Michael Tokarev wrote: > 07.05.2014 13:07, Stanislav Vorobiov wrote: >> From: Sangho Park > [] >> include/glib-compat.h | 19 +++++++++ >> include/qemu-common.h | 12 ------ > > JFYI, this will clash with glib cleanup series I posted earlier > (http://thread.gmane.org/gmane.comp.emulators.qemu/270259) > with some of these patches being pushed via trivial tree > now (http://thread.gmane.org/gmane.comp.emulators.qemu/270767) > > Thanks, > > /mjt >