On 4/11/2019 8:36 PM, Christoph Hellwig wrote:
On Thu, Mar 07, 2019 at 08:02:26PM +0200, Max Gurtovoy wrote:This series applies cleanly on top of kernel 5.0 tag and iser fixs ("IB/iser: Pass the correct number of entries for dma mapped SGL") and ("IB/iser: Fix dma_nents type definition").I tried to apply it to 5.0 with those two patches cherry picked, but it fails to apply in mlx5 code: Applying: RDMA/mlx5: Implement mlx5_ib_map_mr_sg_pi and mlx5_ib_alloc_mr_integrity error: patch failed: drivers/infiniband/hw/mlx5/mlx5_ib.h:585 error: drivers/infiniband/hw/mlx5/mlx5_ib.h: patch does not apply Patch failed at 0009 RDMA/mlx5: Implement mlx5_ib_map_mr_sg_pi and mlx5_ib_alloc_mr_integrity hint: Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Please tell me how I can get an actually working tree with these patches, as it fails even more badly against 5.1-rc..
strange, I'll check it next week. I can send a pointer to a linux fork github repo with those patches...
