Merge drm/drm-next into drm-intel-next-queued
authorJani Nikula <jani.nikula@intel.com>
Tue, 8 Jan 2019 08:50:22 +0000 (10:50 +0200)
committerJani Nikula <jani.nikula@intel.com>
Tue, 8 Jan 2019 08:50:22 +0000 (10:50 +0200)
Generally catch up with 5.0-rc1, and specifically get the changes:

96d4f267e40f ("Remove 'type' argument from access_ok() function")
0b2c8f8b6b0c ("i915: fix missing user_access_end() in page fault exception case")
594cc251fdd0 ("make 'user_access_begin()' do 'access_ok()'")

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1  2 
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_perf.c
drivers/gpu/drm/i915/i915_query.c
drivers/gpu/drm/i915/intel_display.c
include/drm/drm_syncobj.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge