Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 19 May 2022 08:40:49 +1000
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
Message-ID: <20220519084049.3e5b58a8@canb.auug.org.au>
In-Reply-To: <a6df0b8a-dc42-51e4-4b7b-62d1d11c7800@intel.com>
References: <20220517153435.645a9313@canb.auug.org.au>
        <YoTcmqygoMm/gmsZ@matsya>
        <a6df0b8a-dc42-51e4-4b7b-62d1d11c7800@intel.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/iwEHLbp=h.a11iALdq4q1rV";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/iwEHLbp=h.a11iALdq4q1rV
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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=
().
>=20
>   + 		mutex_lock(&wq->wq_lock);
>    		if (wq->state =3D=3D IDXD_WQ_ENABLED) {
>    			idxd_wq_disable_cleanup(wq);
>   -			idxd_wq_device_reset_cleanup(wq);
>    			wq->state =3D 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.
--=20
Cheers,
Stephen Rothwell

--Sig_/iwEHLbp=h.a11iALdq4q1rV
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKFdfEACgkQAVBC80lX
0Gx5gggAmodAG7+qU+4ANAuiYo+8qcafr1zBZR0A+tMy1GXplXTnVePEYqGCg14R
LXQu4myQv0IiRPbS1NoxKSYxnpg/JHVPKD2izitbEZecCUn6bjaAVKqw7ylL25+W
0FSHB0lkXPrmEmY86+4DmnesScTL2hlWugr+STC/pbFvCxyQ/4D6pisRrVClHyxy
lJPNritZVFJL93WzurfhBw8lxMCxlovYpmZoAhCgreM95anKj487FBqK7lepemI2
epPH61EbvTQJ38TQoqzPOofDng8jZzHsKGceYhv1L8UiGh+KvFlagiTDc4mPJoWN
CbMg+N9s/6OP5S8UXcTSrhN8FU5G/g==
=B3b7
-----END PGP SIGNATURE-----

--Sig_/iwEHLbp=h.a11iALdq4q1rV--