From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Aug 2018 22:34:48 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
X-Git-Tag: android-x86-8.1-r1~376
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1290290c922fdcefbce8984e6e44b8f4e3a169b5;p=android-x86%2Fkernel.git

Merge tag 'for-linus' of git://git./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
---

1290290c922fdcefbce8984e6e44b8f4e3a169b5