diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-23 15:34:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-23 15:34:48 -0700 |
| commit | 1290290c922fdcefbce8984e6e44b8f4e3a169b5 (patch) | |
| tree | 524aaccde6f59f6bcddb376c7301d94424465d72 /drivers/infiniband/Kconfig | |
| parent | 706a1ea65e6faaf853427a0e931f59d604dd45e3 (diff) | |
| parent | 845b397a7771f2d3504beff5521f452be0d22eec (diff) | |
| download | op-kernel-dev-1290290c922fdcefbce8984e6e44b8f4e3a169b5.zip op-kernel-dev-1290290c922fdcefbce8984e6e44b8f4e3a169b5.tar.gz | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull more rdma updates from Jason Gunthorpe:
"This is the SMC cleanup promised, a randconfig regression fix, and
kernel oops fix.
Summary:
- Switch SMC over to rdma_get_gid_attr and remove the compat
- Fix a crash in HFI1 with some BIOS's
- Fix a randconfig failure"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
IB/ucm: fix UCM link error
IB/hfi1: Invalid NUMA node information can cause a divide by zero
RDMA/smc: Replace ib_query_gid with rdma_get_gid_attr
Diffstat (limited to 'drivers/infiniband/Kconfig')
| -rw-r--r-- | drivers/infiniband/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index d160d2d..abb6660 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig @@ -36,7 +36,7 @@ config INFINIBAND_USER_ACCESS rdma-core <https://github.com/linux-rdma/rdma-core>. config INFINIBAND_USER_ACCESS_UCM - bool "Userspace CM (UCM, DEPRECATED)" + tristate "Userspace CM (UCM, DEPRECATED)" depends on BROKEN || COMPILE_TEST depends on INFINIBAND_USER_ACCESS help |
