Merge branch 'for-linus' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Nov 2016 18:09:04 +0000 (10:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Nov 2016 18:09:04 +0000 (10:09 -0800)
commit348ce85b0ac6feb2972414f81362c5a5f292354e
treee9c2aa67d393b261c60f60e491ee98357e75ed74
parent980221d14c4eedbfc24a0f2234475850438a4411
parent0cbc72a1781250f373327dd7e306e33859a42154
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