[lkml]   [2019]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the net-next tree with the net tree
On Mon, 2019-04-01 at 09:11 +1100, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the net-next tree got a conflict in:
> drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
> between commit:
> e28408e98bce ("net/mlx5e: Update xon formula")
> from the net tree and commit:
> d3669ca9ff33 ("net/mlx5e: Fix port buffer function documentation
> format")
> from the net-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.

Thanks Stephen, the resolution looks good,
Dave was already notified about this.

 \ /
  Last update: 2019-04-01 20:15    [W:0.037 / U:1.428 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site