lkml.org 
[lkml]   [2018]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the rdma tree with the net tree
On Mon, Jan 15, 2018 at 11:53:21AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/main.c
>
> between commits:
>
> 8978cc921fc7 ("{net,ib}/mlx5: Don't disable local loopback multicast traffic when needed")
> 72f36be06138 ("net/mlx5: Fix mlx5_get_uars_page to return error code")
>
> from the net tree and commits:
>
> 16c1975f1032 ("IB/mlx5: Create profile infrastructure to add and remove stages")
> c8b8992446a9 ("IB/mlx5: Move loopback initialization to the corresponding stage")
>
> from the rdma 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
>

Thanks, Stephen.
It looks right to me.
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2018-01-15 13:25    [W:0.032 / U:19.684 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site