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:   Tue, 17 May 2022 15:34:35 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Vinod Koul <vkoul@kernel.org>
Cc:     Dave Jiang <dave.jiang@intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the dmaengine tree with Linus' tree
Message-ID: <20220517153435.645a9313@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/c4t0jNTZlCZXPEXCew1.RyN";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/c4t0jNTZlCZXPEXCew1.RyN
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the dmaengine tree got a conflict in:

  drivers/dma/idxd/device.c

between commit:

  1cd8e751d96c ("dmaengine: idxd: skip clearing device context when device =
is read-only")

from Linus' tree and commit:

  cf4ac3fef338 ("dmaengine: idxd: fix lockdep warning on device driver remo=
val")

from the dmaengine tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/dma/idxd/device.c
index f652da6ab47d,1143886f4a80..000000000000
--- a/drivers/dma/idxd/device.c
+++ b/drivers/dma/idxd/device.c
@@@ -699,21 -716,23 +716,26 @@@ static void idxd_device_wqs_clear_state
  		struct idxd_wq *wq =3D idxd->wqs[i];
 =20
  		if (wq->state =3D=3D IDXD_WQ_ENABLED) {
+ 			mutex_lock(&wq->wq_lock);
  			idxd_wq_disable_cleanup(wq);
 -			idxd_wq_device_reset_cleanup(wq);
  			wq->state =3D IDXD_WQ_DISABLED;
+ 			mutex_unlock(&wq->wq_lock);
  		}
 +		idxd_wq_device_reset_cleanup(wq);
  	}
  }
 =20
  void idxd_device_clear_state(struct idxd_device *idxd)
  {
 +	if (!test_bit(IDXD_FLAG_CONFIGURABLE, &idxd->flags))
 +		return;
 +
+ 	idxd_device_wqs_clear_state(idxd);
+ 	spin_lock(&idxd->dev_lock);
  	idxd_groups_clear_state(idxd);
  	idxd_engines_clear_state(idxd);
- 	idxd_device_wqs_clear_state(idxd);
+ 	idxd->state =3D IDXD_DEV_DISABLED;
+ 	spin_unlock(&idxd->dev_lock);
  }
 =20
  static void idxd_group_config_write(struct idxd_group *group)

--Sig_/c4t0jNTZlCZXPEXCew1.RyN
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKDM+sACgkQAVBC80lX
0GyXKAf9Err06CkA4FC2G72Ulc/oN1x/Yz1ru53R2bhw2yT/J3RuERy8jeA2Jqas
Ok5tnzwjWEo+anqC8c5w4MJsU03VMdiUGdrQ5CKM3fCo+H9xQYIjozaIr91am7vo
H2fwPDEfa5zF7AY3SD5Pf8bd+bfa+g5MgYuq8VFTBMR/2HJGqUHUK+bh7xhA6DLb
QPupcy/kSgQOgURW1cSpx5y+cAswMClm5GVccJF9Xj/9+py5tITM+B6xwpNeXYMA
WrrBdt6GRvIbFzZpn7wuZ17DM4l+OdyYXYhHAkE526onNQNWzkQKLdyyQQyi8wUL
EthiRvDxZ/1KkOHlT22bppuju7hWcA==
=JxJP
-----END PGP SIGNATURE-----

--Sig_/c4t0jNTZlCZXPEXCew1.RyN--