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

[Dave Jiang]

On 5/18/2022 3:40 PM, Stephen Rothwell wrote:
> Hi Dave,
>
> On Wed, 18 May 2022 10:20:59 -0700 Dave Jiang <dave.jiang@xxxxxxxxx> 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.
Thank you!