Merge branch 'maint'

diff --cc include/isl/ctx.h
index d5ad89e,daf4ef7..456d3dd
--- 1/include/isl/ctx.h
--- 2/include/isl/ctx.h
+++ b/include/isl/ctx.h
@@@ -63,8 -63,8 +63,9 @@@ struct isl_stats 
  enum isl_error {
        isl_error_none = 0,
        isl_error_unknown,
 -      isl_error_invalid
+       isl_error_internal,
 +      isl_error_invalid,
 +      isl_error_unsupported
  };
  struct isl_ctx {
        int                     ref;

diff --cc isl_map.c
Simple merge

diff --cc isl_test.c
Simple merge

diff --cc isl_union_map.c
Simple merge