| Message ID | 20200330114209.1c7d5d11@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | linux-next: manual merge of the crypto tree with the net-next tree | expand |
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,
Hi Herbert, On 3/30/2020 6:19 AM, Herbert Xu wrote: > 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. Ok, We will using netdev tree for sending all chelsio patches from now on. Thanks, Ayush
diff --cc drivers/crypto/chelsio/chcr_core.c index 0015810214a9,7e24c4881c34..000000000000 --- a/drivers/crypto/chelsio/chcr_core.c
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.