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=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 6DE8AC10F13 for ; Mon, 8 Apr 2019 21:32:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A2FD21473 for ; Mon, 8 Apr 2019 21:32:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726680AbfDHVct (ORCPT ); Mon, 8 Apr 2019 17:32:49 -0400 Received: from shards.monkeyblade.net ([23.128.96.9]:40622 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726456AbfDHVcs (ORCPT ); Mon, 8 Apr 2019 17:32:48 -0400 Received: from localhost (unknown [IPv6:2601:601:9f80:35cd::d71]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: davem-davemloft) by shards.monkeyblade.net (Postfix) with ESMTPSA id 2F15E144E3DF2; Mon, 8 Apr 2019 14:32:48 -0700 (PDT) Date: Mon, 08 Apr 2019 14:32:45 -0700 (PDT) Message-Id: <20190408.143245.1691668256420916890.davem@davemloft.net> To: saeedm@mellanox.com Cc: netdev@vger.kernel.org Subject: Re: [pull request][net-next V2 00/15] Mellanox, mlx5 updates 2019-04-02 From: David Miller In-Reply-To: <20190405211719.14979-1-saeedm@mellanox.com> References: <20190405211719.14979-1-saeedm@mellanox.com> X-Mailer: Mew version 6.8 on Emacs 26.1 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Mon, 08 Apr 2019 14:32:48 -0700 (PDT) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Saeed Mahameed Date: Fri, 5 Apr 2019 14:17:04 -0700 > This series adds misc updates to mlx5 driver. > > For more information please see tag log below. > > Please pull and let me know if there is any problem. > > v1->v2: > remove inline keywords from static functions in c files. Pulled, thanks Saeed. The parse_tc_fdb_actions function could use some reverse christmas tree fixing, just FYI. > Please note that the series starts with a merge of mlx5-next branch, > to resolve and avoid dependency with rdma tree. > > Note: when merged with net there is going to be a small merge conflict > in en_tc.c: > ++<<<<<<< HEAD > + err = alloc_tc_pedit_action(priv, MLX5_FLOW_NAMESPACE_KERNEL, > + parse_attr, hdrs, &action, extack); > ++======= > + err = alloc_tc_pedit_action(priv, MLX5_FLOW_NAMESPACE_FDB, > + parse_attr, hdrs, extack); > ++>>>>>>> dave/master > > Resolution: > + err = alloc_tc_pedit_action(priv, MLX5_FLOW_NAMESPACE_FDB, > + parse_attr, hdrs, &action, extack); Thanks for this, it helped a lot.