From: Vinod Koul <vkoul@kernel.org>
To: Dave Jiang <dave.jiang@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree
Date: Mon, 6 Jul 2020 10:11:46 +0530 [thread overview]
Message-ID: <20200706044146.GA633187@vkoul-mobl> (raw)
In-Reply-To: <d3af0beb-1548-7ad3-fb30-f768303b8701@intel.com>
On 05-07-20, 21:23, Dave Jiang wrote:
>
>
> On 7/5/2020 8:56 PM, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the dmaengine tree got a conflict in:
> >
> > drivers/dma/idxd/sysfs.c
> >
> > between commit:
> >
> > da32b28c95a7 ("dmaengine: idxd: cleanup workqueue config after disabling")
> >
> > from the dmaengine-fixes tree and commit:
> >
> > f50b150e315e ("dmaengine: idxd: add work queue drain support")
> >
> > 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.
> >
>
> Hi Stephen. Thanks for the fixup. I think there are two more bits that are
> needed from f50b150e315e if you don't mind adding:
I will merge the fixes into next so it should be resolved for tomorrow,
thanks
>
> diff --cc drivers/dma/idxd/sysfs.c
> index 2e2c5082f322,6f0711a822a1..000000000000
> --- a/drivers/dma/idxd/sysfs.c
> +++ b/drivers/dma/idxd/sysfs.c
> @@@ -313,14 -303,7 +303,12 @@@ static int idxd_config_bus_remove(struc
> }
>
> idxd_unregister_dma_device(idxd);
> - spin_lock_irqsave(&idxd->dev_lock, flags);
> rc = idxd_device_disable(idxd);
> + for (i = 0; i < idxd->max_wqs; i++) {
> + struct idxd_wq *wq = &idxd->wqs[i];
> +
>
> > mutex_lock(&wq->wq_lock);
>
> + idxd_wq_disable_cleanup(wq);
>
> > mutex_unlock(&wq->wq_lock);
>
> + }
> - spin_unlock_irqrestore(&idxd->dev_lock, flags);
> module_put(THIS_MODULE);
> if (rc < 0)
> dev_warn(dev, "Device disable failed\n");
--
~Vinod
next prev parent reply other threads:[~2020-07-06 4:41 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 3:56 linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree Stephen Rothwell
2020-07-06 4:23 ` Dave Jiang
2020-07-06 4:41 ` Vinod Koul [this message]
2020-07-06 6:03 ` Stephen Rothwell
2020-11-19 3:29 Stephen Rothwell
2020-12-14 19:58 ` Stephen Rothwell
2020-12-15 4:33 ` Vinod Koul
2021-07-15 1:40 Stephen Rothwell
2021-12-14 17:24 broonie
2021-12-28 9:09 ` Geert Uytterhoeven
2021-12-28 14:54 ` Jiang, Dave
2022-01-04 21:41 ` Dave Jiang
2022-01-04 23:04 ` Stephen Rothwell
2022-01-05 7:19 ` Vinod Koul
2022-01-06 23:18 ` Dave Jiang
2022-04-12 2:42 Stephen Rothwell
2022-04-12 11:16 ` 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=20200706044146.GA633187@vkoul-mobl \
--to=vkoul@kernel.org \
--cc=dave.jiang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).