From: Jani Nikula Date: Wed, 11 Dec 2019 08:35:37 +0000 (+0200) Subject: Merge drm/drm-next into drm-intel-next-queued X-Git-Tag: v5.15~3115^2~24^2~1517 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=023265ed75d8792ca1d555430a8985511d3f8788;p=platform%2Fkernel%2Flinux-starfive.git 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 --- 023265ed75d8792ca1d555430a8985511d3f8788 diff --cc include/linux/lockdep.h index 827722c,c50d01e..664f52c6 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@@ -626,15 -625,8 +625,15 @@@ do { do { \ typecheck(struct lockdep_map *, &(lock)->dep_map); \ lock_acquire(&(lock)->dep_map, 0, 0, 1, 1, NULL, _THIS_IP_); \ - lock_release(&(lock)->dep_map, 0, _THIS_IP_); \ + lock_release(&(lock)->dep_map, _THIS_IP_); \ } while (0) +# define might_lock_nested(lock, subclass) \ +do { \ + typecheck(struct lockdep_map *, &(lock)->dep_map); \ + lock_acquire(&(lock)->dep_map, subclass, 0, 1, 1, NULL, \ + _THIS_IP_); \ - lock_release(&(lock)->dep_map, 0, _THIS_IP_); \ ++ lock_release(&(lock)->dep_map, _THIS_IP_); \ +} while (0) #define lockdep_assert_irqs_enabled() do { \ WARN_ONCE(debug_locks && !current->lockdep_recursion && \