diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-13 10:09:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-13 10:09:04 -0800 |
| commit | 348ce85b0ac6feb2972414f81362c5a5f292354e (patch) | |
| tree | e9c2aa67d393b261c60f60e491ee98357e75ed74 /include | |
| parent | 980221d14c4eedbfc24a0f2234475850438a4411 (diff) | |
| parent | 0cbc72a1781250f373327dd7e306e33859a42154 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull more block fixes from Jens Axboe:
"Since I mistakenly left out the lightnvm regression fix yesterday and
the aoeblk seems adequately tested at this point, might as well send
out another pull to make -rc5"
* 'for-linus' of git://git.kernel.dk/linux-block:
aoe: fix crash in page count manipulation
lightnvm: invalid offset calculation for lba_shift
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions