Merge branch 'for-linus' of git://

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://
  aoe: fix crash in page count manipulation
  lightnvm: invalid offset calculation for lba_shift