Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull rdma qedr RoCE driver from Doug Ledford: "Early on in the merge window I mentioned I had a backlog of new drivers waiting to be reviewed and that, in addition to the hns-roce driver, I wanted to get possible a couple more reviewed. I ended up only having the time to complete one of the additional drivers. During Dave Miller's pull request this go around, there were a series of 9 patches to the QLogic qed net driver that add basic support for a paired RoCE driver. That support is currently not functional because it is missing the matching RoCE driver in the RDMA subsystem. I managed to finish that review. However, because it goes against part of Dave's net pull, and a part that was accepted a day or two after the merge window opened, to apply cleanly it has to be applied to either the tip of Dave's net branch, or as I did in this case, I just applied it to your master after you had taken Dave...
Showing
- drivers/infiniband/Kconfig 2 additions, 0 deletionsdrivers/infiniband/Kconfig
- drivers/infiniband/hw/Makefile 1 addition, 0 deletionsdrivers/infiniband/hw/Makefile
- drivers/infiniband/hw/qedr/Kconfig 7 additions, 0 deletionsdrivers/infiniband/hw/qedr/Kconfig
- drivers/infiniband/hw/qedr/Makefile 3 additions, 0 deletionsdrivers/infiniband/hw/qedr/Makefile
- drivers/infiniband/hw/qedr/main.c 914 additions, 0 deletionsdrivers/infiniband/hw/qedr/main.c
- drivers/infiniband/hw/qedr/qedr.h 495 additions, 0 deletionsdrivers/infiniband/hw/qedr/qedr.h
- drivers/infiniband/hw/qedr/qedr_cm.c 622 additions, 0 deletionsdrivers/infiniband/hw/qedr/qedr_cm.c
- drivers/infiniband/hw/qedr/qedr_cm.h 61 additions, 0 deletionsdrivers/infiniband/hw/qedr/qedr_cm.h
- drivers/infiniband/hw/qedr/qedr_hsi.h 56 additions, 0 deletionsdrivers/infiniband/hw/qedr/qedr_hsi.h
- drivers/infiniband/hw/qedr/qedr_hsi_rdma.h 748 additions, 0 deletionsdrivers/infiniband/hw/qedr/qedr_hsi_rdma.h
- drivers/infiniband/hw/qedr/verbs.c 3547 additions, 0 deletionsdrivers/infiniband/hw/qedr/verbs.c
- drivers/infiniband/hw/qedr/verbs.h 101 additions, 0 deletionsdrivers/infiniband/hw/qedr/verbs.h
- drivers/net/ethernet/qlogic/Kconfig 0 additions, 11 deletionsdrivers/net/ethernet/qlogic/Kconfig
- include/uapi/linux/pci_regs.h 3 additions, 0 deletionsinclude/uapi/linux/pci_regs.h
- include/uapi/rdma/qedr-abi.h 106 additions, 0 deletionsinclude/uapi/rdma/qedr-abi.h
Please register or sign in to comment