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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8A1CC61DA4 for ; Thu, 2 Feb 2023 08:26:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232107AbjBBI0u (ORCPT ); Thu, 2 Feb 2023 03:26:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229546AbjBBI0t (ORCPT ); Thu, 2 Feb 2023 03:26:49 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95F5BA258; Thu, 2 Feb 2023 00:26:48 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2DE0A6185D; Thu, 2 Feb 2023 08:26:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18692C433EF; Thu, 2 Feb 2023 08:26:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675326407; bh=JG1JmI9JBW9yaMzdHTJELLOmEsFpnPZMc9mFf3CBdpM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=gcsmWB/b/avIssocnYYRDoKU3Ybm1EFLFE6S7RasCMgm6+grZQY8q/vRflTOfvLUl EUtc3nSazW7FzDUOP9JU+lYE2uP+ooJi2NOA8OrucMjW4LdWZtkkmxQ2zD9ozDsj0z CTgxbasjwf5jc9fRnPYQsGMfV0zP0FWymhLHkaxdxYu+q3b2dgUnYg4M1prFPEaR6S IQ+fU7byfyEtZhLg0EHCUMgyMYfqzp4iakpnhLPaU184II7gyUla9BaDhbFio+oIFk 7cTeU7nNGwMx76oGQAtRiXSfrAvUAR/vp4dfbxnXdfnJcW66gItYt0XDZZ+m+n+tcM UWgROdZp0hfIw== Date: Thu, 2 Feb 2023 10:26:43 +0200 From: Leon Romanovsky To: Stephen Rothwell Cc: David Miller , Networking , Jianbo Liu , Jiri Pirko , Linux Kernel Mailing List , Linux Next Mailing List , Saeed Mahameed Subject: Re: linux-next: manual merge of the mlx5-next tree with the net-next tree Message-ID: References: <20230202091433.7fb9d936@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230202091433.7fb9d936@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Feb 02, 2023 at 09:14:33AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mlx5-next tree got a conflict in: > > include/linux/mlx5/driver.h > > between commit: > > fe298bdf6f65 ("net/mlx5: Prepare for fast crypto key update if hardware supports it") > > from the net-next tree and commit: > > 2fd0e75727a8 ("net/mlx5e: Propagate an internal event in case uplink netdev changes") > > from the mlx5-next 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc include/linux/mlx5/driver.h > index 234334194b38,cc48aa308269..000000000000 > --- a/include/linux/mlx5/driver.h > +++ b/include/linux/mlx5/driver.h > @@@ -674,7 -675,7 +675,8 @@@ struct mlx5e_resources > } hw_objs; > struct devlink_port dl_port; > struct net_device *uplink_netdev; > + struct mlx5_crypto_dek_priv *dek_priv; > + struct mutex uplink_netdev_lock; > }; > > enum mlx5_sw_icm_type { LGTM, thanks for the conflict resolution.