summary refs log tree commit diff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-08-24 15:48:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-08-24 15:48:38 -0700
commit90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 (patch)
tree982ae0d6653b7a4b5020b52173cb989bd6e3aab0 /arch
parent4898b99c261efe32348fce28302c01c7b1e1e343 (diff)
parentec2558796d25e6024071b6bcb8e11392538d57bf (diff)
downloadlinux-90a6cd503982bfd33ce8c70eb49bd2dd33bc6325.tar.gz
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull more rdma fixes from Doug Ledford:
 "Well, I thought we were going to be done for this -rc cycle. I should
  have known better than to say so though.

  We have four additional items that trickled in.

  One was a simple mistake on my part. I took a patch into my for-next
  thinking that the issue was less severe than it was. I was then
  notified that it needed to be in my -rc area instead.

  The other three were just found late in testing.

  Summary:

   - One core fix accidentally applied first to for-next and then cherry
     picked back because it needed to be in the -rc cycles instead

   - Another core fix

   - Two mlx5 fixes"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  IB/mlx5: Always return success for RoCE modify port
  IB/mlx5: Fix Raw Packet QP event handler assignment
  IB/core: Avoid accessing non-allocated memory when inferring port type
  RDMA/uverbs: Initialize cq_context appropriately
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions