Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 10 insertions, 0 deletions

diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
index 67e38a056240..9f1ce841a0bb 100644
--- a/net/rxrpc/ar-connection.c
+++ b/net/rxrpc/ar-connection.c
@@ -444,6 +444,11 @@ int rxrpc_connect_call(struct rxrpc_sock *rx,
                         conn = list_entry(bundle->avail_conns.next,
                                           struct rxrpc_connection,
                                           bundle_link);
+                        if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {
+                                list_del_init(&conn->bundle_link);
+                                bundle->num_conns--;
+                                continue;
+                        }
                         if (--conn->avail_calls == 0)
                                 list_move(&conn->bundle_link,
                                           &bundle->busy_conns);
@@ -461,6 +466,11 @@ int rxrpc_connect_call(struct rxrpc_sock *rx,
                         conn = list_entry(bundle->unused_conns.next,
                                           struct rxrpc_connection,
                                           bundle_link);
+                        if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {
+                                list_del_init(&conn->bundle_link);
+                                bundle->num_conns--;
+                                continue;
+                        }
                         ASSERTCMP(conn->avail_calls, ==, RXRPC_MAXCALLS);
                         conn->avail_calls = RXRPC_MAXCALLS - 1;
                         ASSERT(conn->channels[0] == NULL &&