xserver: Branch 'master'

[Adam Jackson]

 glx/glxdri2.c      |    2 +-
 glx/glxdriswrast.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fd0eafb18426da14601d5c0d0a50092c49a7aff8
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Nov 6 16:07:41 2017 -0500

    glx: Fix typos that break GLX_ARB_context_flush_control
    
    The trailing \n are just wrong here, __glXEnableExtension wants a string
    without them.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
    Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 8516368ac..8f5aab0c2 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -896,7 +896,7 @@ initializeExtensions(__GLXscreen * screen)
 #ifdef __DRI2_FLUSH_CONTROL
         if (strcmp(extensions[i]->name, __DRI2_FLUSH_CONTROL) == 0) {
             __glXEnableExtension(screen->glx_enable_bits,
-                                 "GLX_ARB_context_flush_control\n");
+                                 "GLX_ARB_context_flush_control");
         }
 #endif
 
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index 97068546e..5b1f3d1fc 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -383,7 +383,7 @@ initializeExtensions(__GLXscreen * screen)
 #ifdef __DRI2_FLUSH_CONTROL
         if (strcmp(extensions[i]->name, __DRI2_FLUSH_CONTROL) == 0) {
             __glXEnableExtension(screen->glx_enable_bits,
-                                 "GLX_ARB_context_flush_control\n");
+                                 "GLX_ARB_context_flush_control");
         }
 #endif