git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Jani Nikula <jani.nikula@intel.com>
	Wed, 11 Dec 2019 08:35:37 +0000 (10:35 +0200)
committer	Jani Nikula <jani.nikula@intel.com>
	Wed, 11 Dec 2019 09:13:50 +0000 (11:13 +0200)
commit	d0bc0efe9c66c54679bc1d77d43feca7baae6904
tree	0940ba6f005f102062e5842b4ec8073ecd583ac0	tree \| snapshot
parent	80d01fe9ad9a14a7f7ca9bd1b4e3f8849e43c4d5	commit \| diff
parent	47599c6298943ede4662b5e31dfe375feac1b48a	commit \| diff

Merge drm/drm-next into drm-intel-next-queued

Sync up with v5.5-rc1 to get the updated lock_release() API among other
things. Fix the conflict reported by Stephen Rothwell [1].

[1] http://lore.kernel.org/r/20191210093957.5120f717@canb.auug.org.au

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Linux Kernel Source Tree.

RSS Atom

drivers/gpu/drm/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_context.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gem/i915_gem_shrinker.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/gt/intel_engine_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_request.c	diff1 \|	diff2 \|	blob \| history
include/linux/lockdep.h	diff1 \|	diff2 \|	blob \| history