Subject: Re: linux-next: manual merge of the dmaengine tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 19 May 2022 08:40:49 +1000

Hi Dave,

On Wed, 18 May 2022 10:20:59 -0700 Dave Jiang <[email-masked]> wrote:
>
> The lock needs to go around both functions, we can move it outside the if().
> 
>   + 		mutex_lock(&wq->wq_lock);
>    		if (wq->state == IDXD_WQ_ENABLED) {
>    			idxd_wq_disable_cleanup(wq);
>   -			idxd_wq_device_reset_cleanup(wq);
>    			wq->state = IDXD_WQ_DISABLED;
>    		}
>   +		idxd_wq_device_reset_cleanup(wq);
>   + 		mutex_unlock(&wq->wq_lock);

Thanks for checking.  I have made that change to my merge resolution.
-- 
Cheers,
Stephen Rothwell