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

[Herbert Xu]

On Mon, Mar 30, 2020 at 11:42:09AM +1100, Stephen Rothwell wrote:
> 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.

Thanks for the heads up Stephen.

Ayush, I'm going to drop the two chelsio patches.  Going forward,
please send all chelsio patches via netdev.

Thanks,
-- 
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt