diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-16 12:05:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-16 12:05:09 -0700 |
| commit | a86f106f488b170e6a0361c723c5a7ad72d4ab33 (patch) | |
| tree | d4f1f4f55fea318e526208f237db0910abfff20d /arch/arm/mach-omap2/omap_device.c | |
| parent | 11c994d9a50b6ba5a96a1c1450ce0fa7bd840f1c (diff) | |
| parent | 5a8d75a1b8c99bdc926ba69b7b7dbe4fae81a5af (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Four small fixes.
Three of them fix the same error in NVMe, in loop, fc, and rdma
respectively. The last fix from Ming fixes a regression in this
series, where our bvec gap logic was wrong and causes an oops on
NVMe for certain conditions"
* 'for-linus' of git://git.kernel.dk/linux-block:
block: fix bio_will_gap() for first bvec with offset
nvme-fc: Fix sqsize wrong assignment based on ctrl MQES capability
nvme-rdma: Fix sqsize wrong assignment based on ctrl MQES capability
nvme-loop: Fix sqsize wrong assignment based on ctrl MQES capability
Diffstat (limited to 'arch/arm/mach-omap2/omap_device.c')
0 files changed, 0 insertions, 0 deletions