Merge branch 'for-4.12/block' into for-next
authorJens Axboe <axboe@fb.com>
Sat, 8 Apr 2017 17:25:48 +0000 (11:25 -0600)
committerJens Axboe <axboe@fb.com>
Sat, 8 Apr 2017 17:25:48 +0000 (11:25 -0600)
commitffeb3e1125c809108b770f64325bb09ee42f88db
tree60d72a7a27954965fbefd56d19d2d86aa3b40ab4
parentd783b2a895fc65abdc665cb0ff5b38058901de7e
parentbcd069bb250acf6088b60d189ab3ec3ae8dd11a5
Merge branch 'for-4.12/block' into for-next
fs/xfs/xfs_bmap_util.c