Re: [PATCH v4 2/3] locking: Implement an algorithm choice for Wound-Wait mutexes

2019-01-17 Thread Rob Clark
On Wed, Jan 16, 2019 at 11:49 AM Thomas Hellstrom wrote: > > Hi, > > On Wed, 2019-01-16 at 09:24 -0500, Rob Clark wrote: > > So, I guess this is to do w/ the magic of merge commits, but it looks > > like the hunk changing the crtc_ww_class got lost: > > So what happened here is that this commit ch

Re: [PATCH v4 2/3] locking: Implement an algorithm choice for Wound-Wait mutexes

2019-01-16 Thread Thomas Hellstrom
Hi, On Wed, 2019-01-16 at 09:24 -0500, Rob Clark wrote: > So, I guess this is to do w/ the magic of merge commits, but it looks > like the hunk changing the crtc_ww_class got lost: So what happened here is that this commit changed it to DEFINE_WD_CLASS and the following commit changed it back ag

Re: [PATCH v4 2/3] locking: Implement an algorithm choice for Wound-Wait mutexes

2019-01-16 Thread Rob Clark
So, I guess this is to do w/ the magic of merge commits, but it looks like the hunk changing the crtc_ww_class got lost:  ~/src/linux   master  git show --pretty=short 08295b3b5beec9aac0f7a9db86f0fc3792039da3 drivers/gpu/drm/drm_modeset_lock.c commit 08295b3b5beec9aac0f7a9db86f0fc3792039da3 Au