| commit | e3737b9145636e884d7185176cbe76a3f2c645e2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 20 12:28:02 2017 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 20 12:28:02 2017 -0800 |
| tree | 6975956beddec515ebaa2fa88ddb3812a6f421fa | |
| parent | cca112ecf259e24096bc18b736c3ae985e81ac72 [diff] | |
| parent | d61b7f972dab2a7d187c38254845546dfc8eed85 [diff] |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block Pull block fixes from Jens Axboe: "Just two small fixes for this -rc. One is just killing an unused variable from Keith, but the other fixes a performance regression for nbd in this series, where we inadvertently flipped when we set MSG_MORE when outputting data" * 'for-linus' of git://git.kernel.dk/linux-block: nbd: only set MSG_MORE when we have more to send blk-mq: Remove unused variable