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

2020-08-04 Thread Stephen Rothwell
Hi all, On Tue, 28 Jul 2020 18:45:20 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the kspp tree got a conflict in: > > drivers/infiniband/core/uverbs_cmd.c > > between commit: > > 29f3fe1d6854 ("RDMA/uverbs: Remove redundant assignments") > > from the rdma tree and

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

2020-07-28 Thread Leon Romanovsky
On Tue, Jul 28, 2020 at 06:45:20PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kspp tree got a conflict in: > > drivers/infiniband/core/uverbs_cmd.c > > between commit: > > 29f3fe1d6854 ("RDMA/uverbs: Remove redundant assignments") > > from the rdma tree and

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

2020-07-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kspp tree got a conflict in: drivers/infiniband/core/uverbs_cmd.c between commit: 29f3fe1d6854 ("RDMA/uverbs: Remove redundant assignments") from the rdma tree and commit: 3f649ab728cd ("treewide: Remove uninitialized_var() usage") from the kspp