From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Feb 2019 18:32:26 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
X-Git-Tag: microblaze-v5.4-rc1~1319
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=168bd29830e8ebbffcd70d2af50249dca088e1a8;p=linux-2.6-microblaze.git

Merge tag 'for-linus' of git://git./linux/kernel/git/rdma/rdma

Pull rdma fixes from Jason Gunthorpe:
 "Small set of three regression fixing patches, things are looking
  pretty good here.

   - Fix cxgb4 to work again with non-4k page sizes

   - NULL pointer oops in SRP during sg_reset"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  iw_cxgb4: cq/qp mask depends on bar2 pages in a host page
  cxgb4: Export sge_host_page_size to ulds
  RDMA/srp: Rework SCSI device reset handling
---

168bd29830e8ebbffcd70d2af50249dca088e1a8