linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Leon Romanovsky <leon@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Eli Britstein <elibr@mellanox.com>,
	Saeed Mahameed <saeedm@mellanox.com>,
	Bodong Wang <bodong@mellanox.com>
Subject: Re: linux-next: manual merge of the mlx5-next tree with Linus' tree
Date: Tue, 2 Jul 2019 07:03:05 +0300	[thread overview]
Message-ID: <20190702040305.GO4727@mtr-leonro.mtl.com> (raw)
In-Reply-To: <20190702131327.65dfdcd9@canb.auug.org.au>

On Tue, Jul 02, 2019 at 01:13:27PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>
>   drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
>
> between commit:
>
>   955858009708 ("net/mlx5e: Fix number of vports for ingress ACL configuration")
>
> from Linus' tree and commit:
>
>   062f4bf4aab5 ("net/mlx5: E-Switch, Consolidate eswitch function number of VFs")
>
> from the mlx5-next tree.
>
> I fixed it up (I just used the latter version) 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 Stephen,

I expect this conflict will vanish once both rdma and netdev pull
mlx5-next branch, which is based on -rc2.

Thanks

>
> --
> Cheers,
> Stephen Rothwell



  reply	other threads:[~2019-07-02  4:03 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-02  3:13 linux-next: manual merge of the mlx5-next tree with Linus' tree Stephen Rothwell
2019-07-02  4:03 ` Leon Romanovsky [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-08-15  2:37 Stephen Rothwell
2023-08-25  1:05 ` Stephen Rothwell
2023-08-25  1:58   ` Jakub Kicinski
2019-07-02  3:08 Stephen Rothwell
2019-06-17  2:19 Stephen Rothwell
2019-06-17  3:53 ` Leon Romanovsky
2019-06-20  3:05 ` Stephen Rothwell

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=20190702040305.GO4727@mtr-leonro.mtl.com \
    --to=leon@kernel.org \
    --cc=bodong@mellanox.com \
    --cc=elibr@mellanox.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=saeedm@mellanox.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).