tree e9c2aa67d393b261c60f60e491ee98357e75ed74
parent 980221d14c4eedbfc24a0f2234475850438a4411
parent 0cbc72a1781250f373327dd7e306e33859a42154
author Linus Torvalds <torvalds@linux-foundation.org> 1479060544 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1479060544 -0800

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