From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dave Jiang <dave.jiang@intel•com>
Cc: Vinod Koul <vkoul@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the dmaengine tree with Linus' tree
Date: Thu, 19 May 2022 08:40:49 +1000 [thread overview]
Message-ID: <20220519084049.3e5b58a8@canb.auug.org.au> (raw)
In-Reply-To: <a6df0b8a-dc42-51e4-4b7b-62d1d11c7800@intel.com>
[-- Attachment #1: Type: text/plain, Size: 569 bytes --]
Hi Dave,
On Wed, 18 May 2022 10:20:59 -0700 Dave Jiang <dave.jiang@intel•com> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-05-18 22:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-17 5:34 linux-next: manual merge of the dmaengine tree with Linus' tree Stephen Rothwell
2022-05-18 11:46 ` Vinod Koul
2022-05-18 17:20 ` Dave Jiang
2022-05-18 22:40 ` Stephen Rothwell [this message]
2022-05-18 22:43 ` Dave Jiang
-- strict thread matches above, loose matches on Subject: below --
2023-08-22 5:13 Stephen Rothwell
2023-08-22 13:59 ` Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220519084049.3e5b58a8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dave.jiang@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=vkoul@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox