Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-11-12 09:17:05 +09:00
parent 7c5556decd b39545684a
commit fdae5f37a8
37 changed files with 180 additions and 105 deletions
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -829,6 +829,7 @@ struct drm_i915_gem_exec_fence {

 #define I915_EXEC_FENCE_WAIT            (1<<0)
 #define I915_EXEC_FENCE_SIGNAL          (1<<1)
+#define __I915_EXEC_FENCE_UNKNOWN_FLAGS (-(I915_EXEC_FENCE_SIGNAL << 1))
 	__u32 flags;
 };