summaryrefslogtreecommitdiffstats
path: root/drivers/block/loop.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2017-06-16 10:14:59 -0600
committerJens Axboe <axboe@fb.com>2017-06-16 10:14:59 -0600
commitc27b2d634f81d1472a8107fc857481b67555d9bd (patch)
tree3c35ede17e6f13f70a92529f097f2d2412308782 /drivers/block/loop.c
parentcc3f2e9fbf905427b48e112288fbd8f0dbd3252d (diff)
parent6b8190d61a622e095f04451437953acd2d74b371 (diff)
downloadlinux-c27b2d634f81d1472a8107fc857481b67555d9bd.tar.bz2
Merge branch 'nvme-4.13' of git://git.infradead.org/nvme into for-4.13/block
Pull NVMe changes for 4.13 from Christoph: Highlights: - UUID identifier support from Johannes - Lots of cleanups from Sagi - Host Memory Buffer support from me And lots of cleanups and smaller fixes of course. Note that the UUID identifier changes are based on top of the uuid tree. I am the maintainer of that tree and will send it to Linus as soon as 4.12 is released as various other trees depend on it as well (and the diffstat includes those changes unfortunately)
Diffstat (limited to 'drivers/block/loop.c')
0 files changed, 0 insertions, 0 deletions