Merge remote branch 'origin/master' into modesetting-101

Conflicts:

	linux-core/drm_bo.c
	linux-core/drm_drv.c
	shared-core/drm.h
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
	shared-core/radeon_irq.c

1 files changed, 3 insertions, 3 deletions

diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index 3cc54f12..39a849c6 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -2585,7 +2585,7 @@ static void drmBOCopyReply(const struct drm_bo_info_rep *rep, drmBO *buf)
     buf->size = rep->size;
     buf->offset = rep->offset;
     buf->mapHandle = rep->arg_handle;
-    buf->mask = rep->mask;
+    buf->proposedFlags = rep->proposed_flags;
     buf->start = rep->buffer_start;
     buf->fenceFlags = rep->fence_flags;
     buf->replyFlags = rep->rep_flags;
@@ -2599,7 +2599,7 @@ static void drmBOCopyReply(const struct drm_bo_info_rep *rep, drmBO *buf)
 
 int drmBOCreate(int fd, unsigned long size,
 		unsigned pageAlignment, void *user_buffer,
-		uint64_t mask,
+		uint64_t flags,
 		unsigned hint, drmBO *buf)
 {
     struct drm_bo_create_arg arg;
@@ -2609,7 +2609,7 @@ int drmBOCreate(int fd, unsigned long size,
 
     memset(buf, 0, sizeof(*buf));
     memset(&arg, 0, sizeof(arg));
-    req->mask = mask;
+    req->flags = flags;
     req->hint = hint;
     req->size = size;
     req->page_alignment = pageAlignment;