From: Ayush Sawal <ayush.sawal@chelsio.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: ayush.sawal@asicdesigners.com,
Linux Crypto List <linux-crypto@vger.kernel.org>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Rohit Maheshwari <rohitm@chelsio.com>
Subject: Re: linux-next: manual merge of the crypto tree with the net-next tree
Date: Mon, 30 Mar 2020 21:05:26 +0530 [thread overview]
Message-ID: <81cc1934-16d1-0553-f280-83ecd097c0ee@chelsio.com> (raw)
In-Reply-To: <20200330004921.GA30111@gondor.apana.org.au>
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
next prev parent reply other threads:[~2020-03-30 15:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 0:42 linux-next: manual merge of the crypto tree with the net-next tree Stephen Rothwell
2020-03-30 0:49 ` Herbert Xu
2020-03-30 15:35 ` Ayush Sawal [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-07-30 3:22 Stephen Rothwell
2018-07-31 6:24 ` Krzysztof Kozlowski
2018-08-15 3:12 ` Stephen Rothwell
2018-01-25 10:52 Stephen Rothwell
2016-03-07 2:18 Stephen Rothwell
2016-03-07 11:08 ` David Howells
2016-03-08 5:56 ` Stephen Rothwell
2016-03-08 16:48 ` David Howells
2016-03-08 21:22 ` Stephen Rothwell
2013-02-06 2:20 Stephen Rothwell
2013-02-06 5:45 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81cc1934-16d1-0553-f280-83ecd097c0ee@chelsio.com \
--to=ayush.sawal@chelsio.com \
--cc=ayush.sawal@asicdesigners.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rohitm@chelsio.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).