Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/misc/cxl/context.c b/drivers/misc/cxl/context.c
index 10370f280500..7edea9c19199 100644
--- a/drivers/misc/cxl/context.c
+++ b/drivers/misc/cxl/context.c
@@ -223,6 +223,13 @@ int __detach_context(struct cxl_context *ctx)
                 cxl_ops->link_ok(ctx->afu->adapter, ctx->afu));
         flush_work(&ctx->fault_work); /* Only needed for dedicated process */
 
+        /*
+         * Wait until no further interrupts are presented by the PSL
+         * for this context.
+         */
+        if (cxl_ops->irq_wait)
+                cxl_ops->irq_wait(ctx);
+
         /* release the reference to the group leader and mm handling pid */
         put_pid(ctx->pid);
         put_pid(ctx->glpid);