diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-06 11:35:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-06 11:35:32 -0700 |
| commit | 9cb5b787db7089015a78c81564ea5ffad2791a0e (patch) | |
| tree | 08c66941bc8696f9876ccced32bab3a2b52eb9ec /net | |
| parent | 541d8f4d59d79f5d37c8c726f723d42ff307db57 (diff) | |
| parent | 2fe7857176ad6b70e8b2a318506525410e774f34 (diff) | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions