Merge tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull more rdma updates from Doug Ledford: "This merge window was the first where Huawei had to try and coordinate their patches between their net driver and their new roce driver (similar to mlx4 and mlx5). They didn't do horribly, but there were some issues (and we knew that because they simply didn't know what to do in the beginning). As a result, I had a set of patches that depended on some patches that normally would have come to you via Dave's tree. Those patches have been on netdev@ for a while, so I got Dave to give me his approval to send them to you. As such, the other 29 patches I had behind them are also now ready to go. This catches the hns and hns-roce drivers up to current, and for future patches we are working with them to get them up to speed on how to do joint driver development so that they don't have these sorts of cross tree dependency issues again. BTW, Dave gave me perm...
Showing
- Documentation/devicetree/bindings/infiniband/hisilicon-hns-roce.txt 2 additions, 0 deletions...ion/devicetree/bindings/infiniband/hisilicon-hns-roce.txt
- drivers/infiniband/hw/hns/hns_roce_cq.c 15 additions, 8 deletionsdrivers/infiniband/hw/hns/hns_roce_cq.c
- drivers/infiniband/hw/hns/hns_roce_device.h 6 additions, 12 deletionsdrivers/infiniband/hw/hns/hns_roce_device.h
- drivers/infiniband/hw/hns/hns_roce_eq.c 71 additions, 75 deletionsdrivers/infiniband/hw/hns/hns_roce_eq.c
- drivers/infiniband/hw/hns/hns_roce_eq.h 4 additions, 0 deletionsdrivers/infiniband/hw/hns/hns_roce_eq.h
- drivers/infiniband/hw/hns/hns_roce_hem.c 2 additions, 74 deletionsdrivers/infiniband/hw/hns/hns_roce_hem.c
- drivers/infiniband/hw/hns/hns_roce_hem.h 4 additions, 0 deletionsdrivers/infiniband/hw/hns/hns_roce_hem.h
- drivers/infiniband/hw/hns/hns_roce_hw_v1.c 207 additions, 86 deletionsdrivers/infiniband/hw/hns/hns_roce_hw_v1.c
- drivers/infiniband/hw/hns/hns_roce_hw_v1.h 9 additions, 0 deletionsdrivers/infiniband/hw/hns/hns_roce_hw_v1.h
- drivers/infiniband/hw/hns/hns_roce_main.c 31 additions, 5 deletionsdrivers/infiniband/hw/hns/hns_roce_main.c
- drivers/infiniband/hw/hns/hns_roce_mr.c 3 additions, 0 deletionsdrivers/infiniband/hw/hns/hns_roce_mr.c
- drivers/infiniband/hw/hns/hns_roce_pd.c 8 additions, 14 deletionsdrivers/infiniband/hw/hns/hns_roce_pd.c
- drivers/infiniband/hw/hns/hns_roce_qp.c 25 additions, 42 deletionsdrivers/infiniband/hw/hns/hns_roce_qp.c
- drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c 6 additions, 5 deletionsdrivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
- drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c 10 additions, 3 deletionsdrivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
- drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h 2 additions, 0 deletionsdrivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
- drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c 0 additions, 10 deletionsdrivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
- drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h 0 additions, 1 deletiondrivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
- drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c 16 additions, 0 deletionsdrivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
- drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h 4 additions, 0 deletionsdrivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
Please register or sign in to comment