Merge branch 'for-4.12/block' into for-next
authorJens Axboe <axboe@fb.com>
Thu, 20 Apr 2017 18:16:19 +0000 (12:16 -0600)
committerJens Axboe <axboe@fb.com>
Thu, 20 Apr 2017 18:16:19 +0000 (12:16 -0600)
commitb74baaabbc2da23c7870859316f9e15d10f876fe
tree191be4b22f21e64c48e173b99ef82f2a432ef201
parent5e9a6fc343a0a5accf882c2024925d0b539d58a4
parentcaf7df12272118e0274c8353bcfeaf60c7743a47
Merge branch 'for-4.12/block' into for-next
drivers/scsi/sg.c
fs/btrfs/ctree.h
fs/btrfs/disk-io.c