drm: Branch 'master' - 2 commits

 meson.build   |    2 +-
 xf86drmHash.c |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 8c1fddc640999ab94a64129cd3e1c68e6dc14502
Author: Eric Engestrom <[email protected]>
Date:   Wed Nov 7 16:50:06 2018 +0000

    meson: fix typo in compiler flag
    
    Signed-off-by: Eric Engestrom <[email protected]>
    Reviewed-by: Dylan Baker <[email protected]>

diff --git a/meson.build b/meson.build
index 1d7b7863..bdfec816 100644
--- a/meson.build
+++ b/meson.build
@@ -192,7 +192,7 @@ config.set10('HAVE_OPEN_MEMSTREAM', cc.has_function('open_memstream'))
 
 warn_c_args = []
 foreach a : ['-Wall', '-Wextra', '-Wsign-compare', '-Werror=undef',
-             '-Werror-implicit-function-declaration', '-Wpointer-arith',
+             '-Werror=implicit-function-declaration', '-Wpointer-arith',
              '-Wwrite-strings', '-Wstrict-prototypes', '-Wmissing-prototypes',
              '-Wmissing-declarations', '-Wnested-externs', '-Wpacked',
              '-Wswitch-enum', '-Wmissing-format-attribute',
commit 0f2f38bf06ad6211fdfb07e5a4edace07e86f0fc
Author: Eric Engestrom <[email protected]>
Date:   Wed Nov 7 14:30:29 2018 +0000

    xf86drmHash: remove unused loop variable
    
    Reported-by: Jan Vesely <[email protected]>
    Signed-off-by: Eric Engestrom <[email protected]>
    Reviewed-by: Jan Vesely <[email protected]>

diff --git a/xf86drmHash.c b/xf86drmHash.c
index 891b7326..2cf2b80e 100644
--- a/xf86drmHash.c
+++ b/xf86drmHash.c
@@ -105,7 +105,6 @@ static unsigned long HashHash(unsigned long key)
 drm_public void *drmHashCreate(void)
 {
     HashTablePtr table;
-    int          i;
 
     table           = drmMalloc(sizeof(*table));
     if (!table) return NULL;


--