From patchwork Mon Mar 30 00:42:09 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 11464333
X-Patchwork-Delegate: herbert@gondor.apana.org.au
Return-Path: <SRS0=TSvm=5P=vger.kernel.org=linux-crypto-owner@kernel.org>
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
 [172.30.200.123])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F390013A4
	for <patchwork-linux-crypto@patchwork.kernel.org>;
 Mon, 30 Mar 2020 00:42:16 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id BDD452082E
	for <patchwork-linux-crypto@patchwork.kernel.org>;
 Mon, 30 Mar 2020 00:42:16 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
 header.b="FWuUrmSw"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727755AbgC3AmQ (ORCPT
        <rfc822;patchwork-linux-crypto@patchwork.kernel.org>);
        Sun, 29 Mar 2020 20:42:16 -0400
Received: from ozlabs.org ([203.11.71.1]:36583 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1727612AbgC3AmP (ORCPT <rfc822;linux-crypto@vger.kernel.org>);
        Sun, 29 Mar 2020 20:42:15 -0400
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits)
 server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 48rDDz6MhVz9sPR;
        Mon, 30 Mar 2020 11:42:11 +1100 (AEDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au;
        s=201702; t=1585528933;
        bh=B8g4PRJs5T7Ukzd8/GATXCt5GgL5C9WTKDYNobskixI=;
        h=Date:From:To:Cc:Subject:From;
        b=FWuUrmSwHX8w33pVQE9Y7fCySl2ycaPHMXPTPSvXApgtRJY+gZ8NAYSy2FLeD6v+R
         qiSRX6HB4u8bjYj/XDyj1MXHVco03AsqT9C/SQNPiE4n12wnUUu7kdfnPfV2tRtOa4
         b+lBTzSLhwYdiCTKLIJ//ZIWrW9ZD+v4JHwlRj9vnMPRliFNCc9uJNaeHD8bmiNdA/
         SjhKe5rx2B9FkXCpvLvIYzwaa6LC7Jf4D2H9xGMUOw3VB+6FhkA+mlXjvDgM1RDqLJ
         tJ1yutxNGupoD+F9xe4soswNhcOb+ZB0GccMSyEUVxY0AVBva3Mss6xb24zS8n9WvU
         CfA+L6bbFygQQ==
Date: Mon, 30 Mar 2020 11:42:09 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Herbert Xu <herbert@gondor.apana.org.au>,
        Linux Crypto List <linux-crypto@vger.kernel.org>,
        David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Rohit Maheshwari <rohitm@chelsio.com>,
        Ayush Sawal <ayush.sawal@chelsio.com>
Subject: linux-next: manual merge of the crypto tree with the net-next tree
Message-ID: <20200330114209.1c7d5d11@canb.auug.org.au>
MIME-Version: 1.0
Sender: linux-crypto-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

Hi all,

Today's linux-next merge of the crypto tree got a conflict in:

  drivers/crypto/chelsio/chcr_core.c

between commit:

  34aba2c45024 ("cxgb4/chcr : Register to tls add and del callback")

from the net-next tree and commit:

  53351bb96b6b ("crypto: chelsio/chcr - Fixes a deadlock between rtnl_lock and uld_mutex")

from the crypto 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.

diff --cc drivers/crypto/chelsio/chcr_core.c
index 0015810214a9,7e24c4881c34..000000000000
--- a/drivers/crypto/chelsio/chcr_core.c