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

2018-08-14 Thread Stephen Rothwell
Hi all, On Mon, 6 Aug 2018 14:53:31 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > drivers/infiniband/core/rdma_core.c > > between commit: > > 9867f5c6695f ("IB/uverbs: Convert 'bool exclusive' into an enum") > > from the rdma tree and c

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

2018-08-06 Thread Jason Gunthorpe
On Mon, Aug 06, 2018 at 02:53:31PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > drivers/infiniband/core/rdma_core.c > > between commit: > > 9867f5c6695f ("IB/uverbs: Convert 'bool exclusive' into an enum") > > from the rdma tr

linux-next: manual merge of the tip tree with the rdma tree

2018-08-05 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/infiniband/core/rdma_core.c between commit: 9867f5c6695f ("IB/uverbs: Convert 'bool exclusive' into an enum") from the rdma tree and commit: bfc18e389c7a ("atomics/treewide: Rename __atomic_add_unless() => atom

linux-next: manual merge of the tip tree with the rdma tree

2017-11-01 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/infiniband/hw/hfi1/file_ops.c between commit: ecf799852bde ("IB/hfi1: Refactor reset_ctxt() IOCTL") from the rdma tree and commit: 6aa7de059173 ("locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONC