linux-next: manual merge of the crypto tree with the net-next tree

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
Date: Mon, 30 Mar 2020 11:42:09 +1100	[thread overview]
Message-ID: <20200330114209.1c7d5d11@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1984 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

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

--- a/drivers/crypto/chelsio/chcr_core.c
+++ b/drivers/crypto/chelsio/chcr_core.c
@@@ -35,12 -35,12 +35,16 @@@ static int chcr_uld_state_change(void *
  
  static chcr_handler_func work_handlers[NUM_CPL_CMDS] = {
  	[CPL_FW6_PLD] = cpl_fw6_pld_handler,
 +#ifdef CONFIG_CHELSIO_TLS_DEVICE
 +	[CPL_ACT_OPEN_RPL] = chcr_ktls_cpl_act_open_rpl,
 +	[CPL_SET_TCB_RPL] = chcr_ktls_cpl_set_tcb_rpl,
 +#endif
  };
  
+ #ifdef CONFIG_CHELSIO_IPSEC_INLINE
+ static void update_netdev_features(void);
+ #endif /* CONFIG_CHELSIO_IPSEC_INLINE */
+ 
  static struct cxgb4_uld_info chcr_uld_info = {
  	.name = DRV_MODULE_NAME,
  	.nrxq = MAX_ULD_QSETS,
@@@ -204,15 -204,6 +207,11 @@@ static void *chcr_uld_add(const struct 
  	}
  	u_ctx->lldi = *lld;
  	chcr_dev_init(u_ctx);
- #ifdef CONFIG_CHELSIO_IPSEC_INLINE
- 	if (lld->crypto & ULP_CRYPTO_IPSEC_INLINE)
- 		chcr_add_xfrmops(lld);
- #endif /* CONFIG_CHELSIO_IPSEC_INLINE */
 +
 +#ifdef CONFIG_CHELSIO_TLS_DEVICE
 +	if (lld->ulp_crypto & ULP_CRYPTO_KTLS_INLINE)
 +		chcr_enable_ktls(padap(&u_ctx->dev));
 +#endif
  out:
  	return u_ctx;
  }

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
