tree b4253224fd74148708bd1fb210e4155e22ee7b63
parent 635a4ba111e3bd0169fd549b24fe108b1f171713
parent 1eff9d322a444245c67515edb52bc0eb68374aa8
author Linus Torvalds <torvalds@linux-foundation.org> 1470613125 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1470613125 -0700

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull more block fixes from Jens Axboe:
 "As mentioned in the pull the other day, a few more fixes for this
  round, all related to the bio op changes in this series.

  Two fixes, and then a cleanup, renaming bio->bi_rw to bio->bi_opf.  I
  wanted to do that change right after or right before -rc1, so that
  risk of conflict was reduced.  I just rebased the series on top of
  current master, and no new ->bi_rw usage has snuck in"

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: rename bio bi_rw to bi_opf
  target: iblock_execute_sync_cache() should use bio_set_op_attrs()
  mm: make __swap_writepage() use bio_set_op_attrs()
  block/mm: make bdev_ops->rw_page() take a bool for read/write