From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNkCx-0005fO-1K for qemu-devel@nongnu.org; Thu, 04 Apr 2013 09:28:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNkCl-0003aN-S7 for qemu-devel@nongnu.org; Thu, 04 Apr 2013 09:28:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNkCl-0003ZQ-K2 for qemu-devel@nongnu.org; Thu, 04 Apr 2013 09:27:51 -0400 From: Markus Armbruster References: <1365075615-14027-1-git-send-email-stefanha@redhat.com> <515D712E.4090605@redhat.com> Date: Thu, 04 Apr 2013 15:27:45 +0200 In-Reply-To: <515D712E.4090605@redhat.com> (Eric Blake's message of "Thu, 04 Apr 2013 06:25:18 -0600") Message-ID: <8738v6bf3i.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH stable-1.4 0/4] monitor: do not rely on O_NONBLOCK for passed file descriptors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: Michael Roth , qemu-devel@nongnu.org, Stefan Hajnoczi , Luiz Capitulino Eric Blake writes: > On 04/04/2013 05:40 AM, Stefan Hajnoczi wrote: >> Backported to QEMU 1.4 stable branch. >> >> Original series: >> http://lists.nongnu.org/archive/html/qemu-devel/2013-03/msg04756.html >> >> Stefan Hajnoczi (4): >> oslib-posix: rename socket_set_nonblock() to qemu_set_nonblock() >> net: ensure "socket" backend uses non-blocking fds >> qemu-socket: set passed fd non-blocking in socket_connect() >> chardev: clear O_NONBLOCK on SCM_RIGHTS file descriptors >> >> block/nbd.c | 2 +- >> block/sheepdog.c | 6 +++--- >> include/qemu/sockets.h | 4 ++-- >> migration-tcp.c | 2 +- >> migration-unix.c | 2 +- >> migration.c | 2 +- >> nbd.c | 8 ++++---- >> net/socket.c | 13 +++++++++---- >> qemu-char.c | 11 +++++++---- >> slirp/misc.c | 2 +- >> slirp/tcp_subr.c | 4 ++-- >> ui/vnc.c | 2 +- >> util/oslib-posix.c | 4 ++-- >> util/oslib-win32.c | 4 ++-- >> util/qemu-sockets.c | 5 +++-- >> 15 files changed, 40 insertions(+), 31 deletions(-) > > Series: Reviewed-by: Eric Blake > > Is it worth including cherry-pick ids and descriptions of the conflict > resolution done during the backport? In my opinion, any backport needs to point to the original, and I very much prefer pointers in the form added by git-cherry-pick -x.