]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit589791b33f7c9ff75382000d2fc7812e159584b0
treeea0bceef5bd1f62e4993f8f2f22a81f9da5f1f09
parent2d58d32f35a9e97cab7c706bbb0c2d7414f97b3a
parentd6952d4b95d3a6897fcea7446c97f59f8d24556b
Merge drm/drm-next into drm-intel-next-queued

Generally catch up with 5.0-rc1, and specifically get the changes:

a32c85b4fad3 ("Remove 'type' argument from access_ok() function")
025523de5575 ("i915: fix missing user_access_end() in page fault exception case")
e111b200d102 ("make 'user_access_begin()' do 'access_ok()'")

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
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