xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/xwayland/xwayland-shm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 991712f1e8deeb6289ee0abd9910e279d6396246
Merge: 0cd2280 3c85911
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Jul 8 10:43:31 2015 -0700

    Merge remote-tracking branch 'ofourdan/for-keith'

commit 3c859112d38860764bcdb205ab461d00db502f45
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jun 23 15:05:31 2015 +0200

    xwayland: keep temp files out of the client mask
    
    Xwayland opens anonymous files for its sharing buffers, move these
    file descriptors out of the range of the client select mask to avoid
    reaching the maximum number of clients prematurely.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=91072
    
    Tested-by: Olivier Fourdan <fourdan at gmail.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/hw/xwayland/xwayland-shm.c b/hw/xwayland/xwayland-shm.c
index 2d0ce3e..1022c0d 100644
--- a/hw/xwayland/xwayland-shm.c
+++ b/hw/xwayland/xwayland-shm.c
@@ -82,7 +82,7 @@ create_tmpfile_cloexec(char *tmpname)
     }
 #endif
 
-    return fd;
+    return os_move_fd(fd);
 }
 
 /*