Merge branch 'fixes' into next

Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --cc drivers/dma/idxd/idxd.h
Simple merge

diff --cc drivers/dma/idxd/irq.c
Simple merge

diff --cc drivers/dma/idxd/submit.c
index 425eeea,36c9c1a..6ef704d
--- 1/drivers/dma/idxd/submit.c
--- 2/drivers/dma/idxd/submit.c
+++ b/drivers/dma/idxd/submit.c
@@@ -99,6 -162,16 +154,16 @@@ int idxd_submit_desc(struct idxd_wq *wq
         * even on UP because the recipient is a device.
         */
        wmb();
 -              ie = &idxd->irq_entries[desc->vector];
+ 
+       /*
+        * Pending the descriptor to the lockless list for the irq_entry
+        * that we designated the descriptor to.
+        */
+       if (desc->hw->flags & IDXD_OP_FLAG_RCI) {
++              ie = &idxd->irq_entries[wq->id + 1];
+               llist_add(&desc->llnode, &ie->pending_llist);
+       }
+ 
        if (wq_dedicated(wq)) {
                iosubmit_cmds512(portal, desc->hw, 1);
        } else {
@@@ -110,7 -183,8 +175,9 @@@
                 */
                rc = enqcmds(portal, desc->hw);
                if (rc < 0) {
 +                      percpu_ref_put(&wq->wq_active);
+                       if (ie)
+                               llist_abort_desc(wq, ie, desc);
                        return rc;
                }
        }