Eric Blake <ebl...@redhat.com> 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 <ebl...@redhat.com> > > 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.
