Re: linux-next: manual merge of the rdma tree with the nfs-anna tree

Hi all, On Mon, 24 Dec 2018 14:13:52 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the rdma tree got a conflict in: > > net/sunrpc/xprtrdma/fmr_ops.c > > between commit: > > d31f8deac38d ("xprtrdma: Remove support for FMR memory registration") > > from the nfs-anna tree a

linux-next: manual merge of the rdma tree with the nfs-anna tree

Hi all, Today's linux-next merge of the rdma tree got a conflict in: net/sunrpc/xprtrdma/fmr_ops.c between commit: d31f8deac38d ("xprtrdma: Remove support for FMR memory registration") from the nfs-anna tree and commit: 3023a1e93656 ("RDMA: Start use ib_device_ops") from the rdma tree.