drm: Branch 'master'

[<eve...@ke...>]

 xf86drm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3bc14c8cb99a8c4d927e07f947449c3e50d188c9
Author: Grazvydas Ignotas <no...@gm...>
Date:   Sun Dec 11 20:03:56 2016 +0200

    xf86drm: fix sign-compare warning
    
    xf86drm.c:3601:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
         while (expected < sizeof(match)) {
                         ^
    
    Signed-off-by: Grazvydas Ignotas <no...@gm...>
    Reviewed-by: Emil Velikov <emi...@co...>

diff --git a/xf86drm.c b/xf86drm.c
index 2e8c956..b5eeeb0 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -3582,7 +3582,7 @@ char *drmGetDeviceNameFromFd2(int fd)
     FILE *f;
     char buf[512];
     static const char match[9] = "\nDEVNAME=";
-    int expected = 1;
+    size_t expected = 1;
 
 
     if (fstat(fd, &sbuf))