From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Apr 2016 18:35:32 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
X-Git-Tag: v5.15~13861
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9cb5b787db7089015a78c81564ea5ffad2791a0e;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull rdma fixes from Doug Ledford:
 "I'm back from PTO.  These issues cropped up while I was gone and are
  simple fixes.  I'll have more after I've caught up, but I wanted to
  get these in quick.

  Two minor fixes for 4.6-rc2:

   - Fix mlx5 build error when on demand paging is not enabled

   - Fix possible uninit variable in new i40iw driver"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  i40iw: avoid potential uninitialized variable use
  IB/mlx5: fix VFs callback function prototypes
---

9cb5b787db7089015a78c81564ea5ffad2791a0e