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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <81cc1934-16d1-0553-f280-83ecd097c0ee@chelsio.com>
Date:   Mon, 30 Mar 2020 21:05:26 +0530
From:   Ayush Sawal <ayush.sawal@...lsio.com>
To:     Herbert Xu <herbert@...dor.apana.org.au>,
        Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     ayush.sawal@...cdesigners.com,
        Linux Crypto List <linux-crypto@...r.kernel.org>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Rohit Maheshwari <rohitm@...lsio.com>
Subject: Re: linux-next: manual merge of the crypto tree with the net-next
 tree

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