linux-next: manual merge of the rdma tree with Linus' tree

Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/hw/hfi1/hfi.h between commit: 5de61a47eb90 ("IB/hfi1: Fix probe time panic when AIP is enabled with a buggy BIOS") from Linus' tree and commit: 780278c2c8bb ("IB/hfi1: Rework AIP and VNIC dummy

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

On Wed, 2021-02-10 at 22:08 +, Pearson, Robert B wrote: > Looks perfect. Thanks. +1 Thanks everyone.

RE: linux-next: manual merge of the rdma tree with Linus' tree

merge of the rdma tree with Linus' tree On Wed, Feb 10, 2021 at 06:57:24PM +, Pearson, Robert B wrote: > It looks like f1b0a8ea9f12 ("Revert "RDMA/rxe: Remove VLAN code > leftovers from RXE"") has not been applied to rdma for-next which is > where I do my work.

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

On Wed, Feb 10, 2021 at 06:57:24PM +, Pearson, Robert B wrote: > It looks like f1b0a8ea9f12 ("Revert "RDMA/rxe: Remove VLAN code > leftovers from RXE"") has not been applied to rdma for-next which is > where I do my work. Not sure how it got upstream. It was sent to the rc tree, don't worry

RE: linux-next: manual merge of the rdma tree with Linus' tree

021 8:16 PM To: Doug Ledford ; Jason Gunthorpe Cc: Pearson, Robert B ; Bob Pearson ; Jason Gunthorpe ; Jason Gunthorpe ; Linux Kernel Mailing List ; Linux Next Mailing List ; Martin Wilck Subject: linux-next: manual merge of the rdma tree with Linus' tree Hi all, Today's linux-next merge

linux-next: manual merge of the rdma tree with Linus' tree

Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/sw/rxe/rxe_net.c between commit: f1b0a8ea9f12 ("Revert "RDMA/rxe: Remove VLAN code leftovers from RXE"") from Linus' tree and commit: 899aba891cab ("RDMA/rxe: Fix FIXME in rxe_udp_encap_recv()")

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

On Thu, 2019-06-20 at 12:10 +1000, Stephen Rothwell wrote: > 2d3c72ed5041 ("rdma: Remove nes") Yeah, not much you can do about tree wide patchsets conflicting with a removal ;-) -- Doug Ledford GPG KeyID: B826A3330E572FDD Fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57

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

On Thu, 2019-06-20 at 12:06 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rdma tree got a conflict in: > > include/rdma/ib_verbs.h > > between commit: > > dc1435c00fcd ("RDMA/srp: Rename SRP sysfs name after IB device > rename trigger") > > from Linus' tree

linux-next: manual merge of the rdma tree with Linus' tree

Hi all, Today's linux-next merge of the rdma tree got conflicts in: drivers/infiniband/hw/nes/Kconfig drivers/infiniband/hw/nes/Makefile between commit: ec8f24b7faaf ("treewide: Add SPDX license identifier - Makefile/Kconfig") from Linus' tree and commit: 2d3c72ed5041 ("rdma: Remove

linux-next: manual merge of the rdma tree with Linus' tree

Hi all, Today's linux-next merge of the rdma tree got a conflict in: include/rdma/ib_verbs.h between commit: dc1435c00fcd ("RDMA/srp: Rename SRP sysfs name after IB device rename trigger") from Linus' tree and commit: 0e2d00eb6fd4 ("RDMA: Add NLDEV_GET_CHARDEV to allow char dev

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

On Fri, 2019-06-14 at 13:00 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rdma tree got conflicts in: > > drivers/infiniband/core/uverbs_cmd.c > drivers/infiniband/core/uverbs_std_types_cq.c > > between commit: > > 6876aaedc8a1 ("RDMA/uverbs: Pass udata on

linux-next: manual merge of the rdma tree with Linus' tree

Hi all, Today's linux-next merge of the rdma tree got conflicts in: drivers/infiniband/core/uverbs_cmd.c drivers/infiniband/core/uverbs_std_types_cq.c between commit: 6876aaedc8a1 ("RDMA/uverbs: Pass udata on uverbs error unwind") from Linus' tree and commit: e39afe3d6dbd ("RDMA:

RE: linux-next: manual merge of the rdma tree with Linus' tree

Hi Stephen, > -Original Message- > From: Stephen Rothwell > Sent: Thursday, September 27, 2018 7:01 PM > To: Doug Ledford ; Jason Gunthorpe > > Cc: Linux-Next Mailing List ; Linux Kernel > Mailing List ; Parav Pandit > > Subject: linux-next: manual merge

RE: linux-next: manual merge of the rdma tree with Linus' tree

Hi Stephen, > -Original Message- > From: Stephen Rothwell > Sent: Thursday, September 27, 2018 7:01 PM > To: Doug Ledford ; Jason Gunthorpe > > Cc: Linux-Next Mailing List ; Linux Kernel > Mailing List ; Parav Pandit > > Subject: linux-next: manual merge

linux-next: manual merge of the rdma tree with Linus' tree

Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/core/cache.c between commit: 5c5702e259dc ("RDMA/core: Set right entry state before releasing reference") from Linus' tree and commit: 43c7c851b9bc ("RDMA/core: Use dev_err/dbg/etc instead of pr_* +

linux-next: manual merge of the rdma tree with Linus' tree

Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/core/cache.c between commit: 5c5702e259dc ("RDMA/core: Set right entry state before releasing reference") from Linus' tree and commit: 43c7c851b9bc ("RDMA/core: Use dev_err/dbg/etc instead of pr_* +

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

Hi Jason, On Mon, 6 Aug 2018 13:41:42 -0600 Jason Gunthorpe wrote: > > The resolution should end up like this: > > srcu_key = srcu_read_lock(>device->disassociate_srcu); > > if (!verify_command_mask(file, command, extended)) { > ret = -EOPNOTSUPP; >

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

Hi Jason, On Mon, 6 Aug 2018 13:41:42 -0600 Jason Gunthorpe wrote: > > The resolution should end up like this: > > srcu_key = srcu_read_lock(>device->disassociate_srcu); > > if (!verify_command_mask(file, command, extended)) { > ret = -EOPNOTSUPP; >

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

On Mon, Aug 06, 2018 at 12:01:31PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rdma tree got a conflict in: > > drivers/infiniband/core/uverbs_main.c > > between commit: > > 1eb9364ce81d ("IB/uverbs: Fix ordering of ucontext check in > ib_uverbs_write") >

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

On Mon, Aug 06, 2018 at 12:01:31PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rdma tree got a conflict in: > > drivers/infiniband/core/uverbs_main.c > > between commit: > > 1eb9364ce81d ("IB/uverbs: Fix ordering of ucontext check in > ib_uverbs_write") >

linux-next: manual merge of the rdma tree with Linus' tree

Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/core/uverbs_main.c between commit: 1eb9364ce81d ("IB/uverbs: Fix ordering of ucontext check in ib_uverbs_write") from Linus' tree and commit: a9b66d6453d7 ("IB/uverbs: Do not block disassociate

linux-next: manual merge of the rdma tree with Linus' tree

Hi all, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/core/uverbs_main.c between commit: 1eb9364ce81d ("IB/uverbs: Fix ordering of ucontext check in ib_uverbs_write") from Linus' tree and commit: a9b66d6453d7 ("IB/uverbs: Do not block disassociate

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/net/ethernet/mellanox/mlx5/core/main.c between commit: eeb66cdb6826 ("net/mlx5: Separate between E-Switch and MPFS") from Linus' tree and commit: c85023e153e3 ("IB/mlx5: Add raw ethernet local loopback

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/net/ethernet/mellanox/mlx5/core/main.c between commit: eeb66cdb6826 ("net/mlx5: Separate between E-Switch and MPFS") from Linus' tree and commit: c85023e153e3 ("IB/mlx5: Add raw ethernet local loopback

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

On Fri, Jul 14, 2017 at 10:33:54AM -0400, Doug Ledford wrote: > So, you need to take your pick. Do you want continuous development, or > do you want me bending over backwards to try and avoid your company's > endless stream of conflicts so Linus isn't yelling about that? Doug, You are mixing my

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

On Fri, Jul 14, 2017 at 10:33:54AM -0400, Doug Ledford wrote: > So, you need to take your pick. Do you want continuous development, or > do you want me bending over backwards to try and avoid your company's > endless stream of conflicts so Linus isn't yelling about that? Doug, You are mixing my

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

On Fri, 2017-07-14 at 07:54 +0300, Leon Romanovsky wrote: > On Fri, Jul 14, 2017 at 12:12:33AM -0400, Doug Ledford wrote: > > On Fri, 2017-07-14 at 06:34 +0300, Leon Romanovsky wrote: > > > On Thu, Jul 13, 2017 at 09:17:13PM -0400, Doug Ledford wrote: > > > > On Fri, 2017-07-14 at 11:14 +1000,

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

On Fri, 2017-07-14 at 07:54 +0300, Leon Romanovsky wrote: > On Fri, Jul 14, 2017 at 12:12:33AM -0400, Doug Ledford wrote: > > On Fri, 2017-07-14 at 06:34 +0300, Leon Romanovsky wrote: > > > On Thu, Jul 13, 2017 at 09:17:13PM -0400, Doug Ledford wrote: > > > > On Fri, 2017-07-14 at 11:14 +1000,

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

On Fri, Jul 14, 2017 at 08:03:49AM -0400, Doug Ledford wrote: > On Fri, 2017-07-14 at 07:55 +0300, Leon Romanovsky wrote: > > On Fri, Jul 14, 2017 at 01:50:26PM +1000, Stephen Rothwell wrote: > > > Hi all, > > > > > > On Fri, 14 Jul 2017 06:34:16 +0300 Leon Romanovsky > > >

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

On Fri, Jul 14, 2017 at 08:03:49AM -0400, Doug Ledford wrote: > On Fri, 2017-07-14 at 07:55 +0300, Leon Romanovsky wrote: > > On Fri, Jul 14, 2017 at 01:50:26PM +1000, Stephen Rothwell wrote: > > > Hi all, > > > > > > On Fri, 14 Jul 2017 06:34:16 +0300 Leon Romanovsky > > > wrote: > > > > > > > >

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

On Fri, 2017-07-14 at 07:55 +0300, Leon Romanovsky wrote: > On Fri, Jul 14, 2017 at 01:50:26PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > On Fri, 14 Jul 2017 06:34:16 +0300 Leon Romanovsky > > wrote: > > > > > > Sorry Doug, but it is not expected at all for the code

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

On Fri, 2017-07-14 at 07:55 +0300, Leon Romanovsky wrote: > On Fri, Jul 14, 2017 at 01:50:26PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > On Fri, 14 Jul 2017 06:34:16 +0300 Leon Romanovsky > > wrote: > > > > > > Sorry Doug, but it is not expected at all for the code which will > > > go

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

On Fri, Jul 14, 2017 at 01:50:26PM +1000, Stephen Rothwell wrote: > Hi all, > > On Fri, 14 Jul 2017 06:34:16 +0300 Leon Romanovsky wrote: > > > > Sorry Doug, but it is not expected at all for the code which will go to > > 4.14. > > > > Both patches in question were targeted for

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

On Fri, Jul 14, 2017 at 01:50:26PM +1000, Stephen Rothwell wrote: > Hi all, > > On Fri, 14 Jul 2017 06:34:16 +0300 Leon Romanovsky wrote: > > > > Sorry Doug, but it is not expected at all for the code which will go to > > 4.14. > > > > Both patches in question were targeted for 4.13 and you was

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

On Fri, Jul 14, 2017 at 12:12:33AM -0400, Doug Ledford wrote: > On Fri, 2017-07-14 at 06:34 +0300, Leon Romanovsky wrote: > > On Thu, Jul 13, 2017 at 09:17:13PM -0400, Doug Ledford wrote: > > > On Fri, 2017-07-14 at 11:14 +1000, Stephen Rothwell wrote: > > > > Hi Doug, > > > > > > > > Today's

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

On Fri, Jul 14, 2017 at 12:12:33AM -0400, Doug Ledford wrote: > On Fri, 2017-07-14 at 06:34 +0300, Leon Romanovsky wrote: > > On Thu, Jul 13, 2017 at 09:17:13PM -0400, Doug Ledford wrote: > > > On Fri, 2017-07-14 at 11:14 +1000, Stephen Rothwell wrote: > > > > Hi Doug, > > > > > > > > Today's

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

On Fri, 2017-07-14 at 06:34 +0300, Leon Romanovsky wrote: > On Thu, Jul 13, 2017 at 09:17:13PM -0400, Doug Ledford wrote: > > On Fri, 2017-07-14 at 11:14 +1000, Stephen Rothwell wrote: > > > Hi Doug, > > > > > > Today's linux-next merge of the rdma tree got conflicts in: > > > > > >

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

On Fri, 2017-07-14 at 06:34 +0300, Leon Romanovsky wrote: > On Thu, Jul 13, 2017 at 09:17:13PM -0400, Doug Ledford wrote: > > On Fri, 2017-07-14 at 11:14 +1000, Stephen Rothwell wrote: > > > Hi Doug, > > > > > > Today's linux-next merge of the rdma tree got conflicts in: > > > > > >

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

Hi all, On Fri, 14 Jul 2017 06:34:16 +0300 Leon Romanovsky wrote: > > Sorry Doug, but it is not expected at all for the code which will go to 4.14. > > Both patches in question were targeted for 4.13 and you was expected to > see the merge conflicts during last month or so,

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

Hi all, On Fri, 14 Jul 2017 06:34:16 +0300 Leon Romanovsky wrote: > > Sorry Doug, but it is not expected at all for the code which will go to 4.14. > > Both patches in question were targeted for 4.13 and you was expected to > see the merge conflicts during last month or so, prior to merge

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

On Thu, Jul 13, 2017 at 09:17:13PM -0400, Doug Ledford wrote: > On Fri, 2017-07-14 at 11:14 +1000, Stephen Rothwell wrote: > > Hi Doug, > > > > Today's linux-next merge of the rdma tree got conflicts in: > > > > drivers/infiniband/core/uverbs_cmd.c > > drivers/infiniband/core/verbs.c > > > >

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

On Thu, Jul 13, 2017 at 09:17:13PM -0400, Doug Ledford wrote: > On Fri, 2017-07-14 at 11:14 +1000, Stephen Rothwell wrote: > > Hi Doug, > > > > Today's linux-next merge of the rdma tree got conflicts in: > > > > drivers/infiniband/core/uverbs_cmd.c > > drivers/infiniband/core/verbs.c > > > >

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

On Fri, 2017-07-14 at 11:14 +1000, Stephen Rothwell wrote: > Hi Doug, > > Today's linux-next merge of the rdma tree got conflicts in: > > drivers/infiniband/core/uverbs_cmd.c > drivers/infiniband/core/verbs.c > > between commit: > > d291f1a65232 ("IB/core: Enforce PKey security on QPs")

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

On Fri, 2017-07-14 at 11:14 +1000, Stephen Rothwell wrote: > Hi Doug, > > Today's linux-next merge of the rdma tree got conflicts in: > > drivers/infiniband/core/uverbs_cmd.c > drivers/infiniband/core/verbs.c > > between commit: > > d291f1a65232 ("IB/core: Enforce PKey security on QPs")

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got conflicts in: drivers/infiniband/core/uverbs_cmd.c drivers/infiniband/core/verbs.c between commit: d291f1a65232 ("IB/core: Enforce PKey security on QPs") from Linus' tree and commits: c7c0fb974caa ("IB/core: Introduce modify QP

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got conflicts in: drivers/infiniband/core/uverbs_cmd.c drivers/infiniband/core/verbs.c between commit: d291f1a65232 ("IB/core: Enforce PKey security on QPs") from Linus' tree and commits: c7c0fb974caa ("IB/core: Introduce modify QP

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/sw/rxe/rxe_req.c between commit: 002e062e13db ("IB/rxe: Fix handling of erroneous WR") from Linus' tree and commit: 37f69f43fb5a ("IB/rxe: Hold refs when running tasklets") from the rdma tree. I

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/infiniband/sw/rxe/rxe_req.c between commit: 002e062e13db ("IB/rxe: Fix handling of erroneous WR") from Linus' tree and commit: 37f69f43fb5a ("IB/rxe: Hold refs when running tasklets") from the rdma tree. I

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got conflicts in: drivers/net/ethernet/mellanox/mlx4/fw.c include/linux/mlx4/device.h between commit: 7c3d21c8153c ("net/mlx4_core: Preparation for VF vlan protocol 802.1ad") from Linus' tree and commit: fd10ed8e6f42 ("IB/mlx4: Fix

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got conflicts in: drivers/net/ethernet/mellanox/mlx4/fw.c include/linux/mlx4/device.h between commit: 7c3d21c8153c ("net/mlx4_core: Preparation for VF vlan protocol 802.1ad") from Linus' tree and commit: fd10ed8e6f42 ("IB/mlx4: Fix

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c between commit: 0fbc81b3ad51 ("chcr/cxgb4i/cxgbit/RDMA/cxgb4: Allocate resources dynamically for all cxgb4 ULD's") from Linus' tree and commit: 086de575c142 ("cxgb4:

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c between commit: 0fbc81b3ad51 ("chcr/cxgb4i/cxgbit/RDMA/cxgb4: Allocate resources dynamically for all cxgb4 ULD's") from Linus' tree and commit: 086de575c142 ("cxgb4:

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h between commit: 8ae7b8a59938 ("net: hns: fix sbm default parameters config error") from Linus' tree and commit: c80815c0b214 ("net: hns: Add reset function support

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h between commit: 8ae7b8a59938 ("net: hns: fix sbm default parameters config error") from Linus' tree and commit: c80815c0b214 ("net: hns: Add reset function support

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c between commits: a24274aa5c23 ("net: hns: add dsaf misc operation method") f00ef863da2b ("net: hns: implement the miscellaneous operation by asl") from Linus' tree

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c between commits: a24274aa5c23 ("net: hns: add dsaf misc operation method") f00ef863da2b ("net: hns: implement the miscellaneous operation by asl") from Linus' tree

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: MAINTAINERS between commit: b30d74e42d78 ("MAINTAINERS: add maintainers for hns driver") from Linus' tree and commit: dd778a9920a6 ("MAINTAINERS: Add maintainers for Hisilicon RoCE driver") from the rdma tree. I

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: MAINTAINERS between commit: b30d74e42d78 ("MAINTAINERS: add maintainers for hns driver") from Linus' tree and commit: dd778a9920a6 ("MAINTAINERS: Add maintainers for Hisilicon RoCE driver") from the rdma tree. I

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: include/linux/mlx5/driver.h between commit: 43a335e055bb ("net/mlx5_core: Flow counters infrastructure") from Linus' tree and commit: 94c6825e0ff7 ("net/mlx5_core: Use tasklet for user-space CQ completion events")

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: include/linux/mlx5/driver.h between commit: 43a335e055bb ("net/mlx5_core: Flow counters infrastructure") from Linus' tree and commit: 94c6825e0ff7 ("net/mlx5_core: Use tasklet for user-space CQ completion events")

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/staging/rdma/hfi1/verbs.c between commit: e1af35bc7942 ("staging: rdma: hfi1: Use setup_timer") from Linus' tree and commit: 045277cf1548 ("IB/qib,staging/rdma/hfi1: use setup_timer api") from the rdma tree.

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/staging/rdma/hfi1/verbs.c between commit: e1af35bc7942 ("staging: rdma: hfi1: Use setup_timer") from Linus' tree and commit: 045277cf1548 ("IB/qib,staging/rdma/hfi1: use setup_timer api") from the rdma tree.

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/staging/rdma/hfi1/user_pages.c between commit: 7e43d4d25558 ("staging: rdma: hfi1: Compress return logic") from Linus' tree and commit: 0b091fb32c5a ("staging/hfi1: Enable TID caching feature") from the rdma

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/staging/rdma/hfi1/user_pages.c between commit: 7e43d4d25558 ("staging: rdma: hfi1: Compress return logic") from Linus' tree and commit: 0b091fb32c5a ("staging/hfi1: Enable TID caching feature") from the rdma

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got conflicts in: drivers/staging/rdma/hfi1/keys.c drivers/staging/rdma/hfi1/mr.c between commits: 809487c70388 ("staging: rdma: hfi1: Use DIV_ROUND_UP") 037f741673e0 ("staging: rdma: hfi1: Do not use | with a variable with value 0")

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got conflicts in: drivers/staging/rdma/hfi1/keys.c drivers/staging/rdma/hfi1/mr.c between commits: 809487c70388 ("staging: rdma: hfi1: Use DIV_ROUND_UP") 037f741673e0 ("staging: rdma: hfi1: Do not use | with a variable with value 0")

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/staging/rdma/hfi1/mad.c between commits: a4fe1bc16411 ("staging: rdma: hfi1: Remove casts of pointer to same type") acc17d671c62 ("staging: rdma: hfi1: Remove unnecessary parantheses") from Linus' tree and

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: drivers/staging/rdma/hfi1/mad.c between commits: a4fe1bc16411 ("staging: rdma: hfi1: Remove casts of pointer to same type") acc17d671c62 ("staging: rdma: hfi1: Remove unnecessary parantheses") from Linus' tree and

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

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: net/sunrpc/xprtrdma/svc_rdma_recvfrom.c between commit: c91aed989694 ("svcrdma: handle rdma read with a non-zero initial page offset") from Linus' tree and commit: 412a15c0fe53 ("svcrdma: Port to new memory

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

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: net/sunrpc/xprtrdma/svc_rdma_recvfrom.c between commit: c91aed989694 ("svcrdma: handle rdma read with a non-zero initial page offset") from Linus' tree and commit: 412a15c0fe53 ("svcrdma: Port to new memory

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: net/sunrpc/xprtrdma/svc_rdma_recvfrom.c between commit: c91aed989694 ("svcrdma: handle rdma read with a non-zero initial page offset") from Linus' tree and commit: 412a15c0fe53 ("svcrdma: Port to new memory

linux-next: manual merge of the rdma tree with Linus' tree

Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: net/sunrpc/xprtrdma/svc_rdma_recvfrom.c between commit: c91aed989694 ("svcrdma: handle rdma read with a non-zero initial page offset") from Linus' tree and commit: 412a15c0fe53 ("svcrdma: Port to new memory