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
Date: Tue, 17 May 2022 15:34:35 +1000 [thread overview]
Message-ID: <20220517153435.645a9313@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1787 bytes --]
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 removal")
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.
--
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 = idxd->wqs[i];
if (wq->state == IDXD_WQ_ENABLED) {
+ mutex_lock(&wq->wq_lock);
idxd_wq_disable_cleanup(wq);
- idxd_wq_device_reset_cleanup(wq);
wq->state = IDXD_WQ_DISABLED;
+ mutex_unlock(&wq->wq_lock);
}
+ idxd_wq_device_reset_cleanup(wq);
}
}
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 = IDXD_DEV_DISABLED;
+ spin_unlock(&idxd->dev_lock);
}
static void idxd_group_config_write(struct idxd_group *group)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-05-17 5:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-17 5:34 Stephen Rothwell [this message]
2022-05-18 11:46 ` linux-next: manual merge of the dmaengine tree with Linus' tree Vinod Koul
2022-05-18 17:20 ` Dave Jiang
2022-05-18 22:40 ` Stephen Rothwell
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=20220517153435.645a9313@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