From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D19FFC2D0E9 for ; Mon, 30 Mar 2020 00:49:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B32DA206E6 for ; Mon, 30 Mar 2020 00:49:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727884AbgC3Ato (ORCPT ); Sun, 29 Mar 2020 20:49:44 -0400 Received: from helcar.hmeau.com ([216.24.177.18]:48608 "EHLO fornost.hmeau.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727742AbgC3Atn (ORCPT ); Sun, 29 Mar 2020 20:49:43 -0400 Received: from gwarestrin.me.apana.org.au ([192.168.0.7] helo=gwarestrin.arnor.me.apana.org.au) by fornost.hmeau.com with smtp (Exim 4.89 #2 (Debian)) id 1jIicD-0007Fo-Kh; Mon, 30 Mar 2020 11:49:22 +1100 Received: by gwarestrin.arnor.me.apana.org.au (sSMTP sendmail emulation); Mon, 30 Mar 2020 11:49:21 +1100 Date: Mon, 30 Mar 2020 11:49:21 +1100 From: Herbert Xu To: Stephen Rothwell Cc: Linux Crypto List , David Miller , Networking , Linux Next Mailing List , Linux Kernel Mailing List , Rohit Maheshwari , Ayush Sawal Subject: Re: linux-next: manual merge of the crypto tree with the net-next tree Message-ID: <20200330004921.GA30111@gondor.apana.org.au> References: <20200330114209.1c7d5d11@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200330114209.1c7d5d11@canb.auug.org.au> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt