projects / linux-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a67a951 77387b8)
Merge branch 'stable/for-jens-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git... for-4.1/drivers
authorJens Axboe <axboe@fb.com>
Wed, 8 Apr 2015 02:00:45 +0000 (20:00 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 8 Apr 2015 02:00:45 +0000 (20:00 -0600)
Konrad writes:

This pull has one fix and an cleanup.

Note that David Vrabel in the xen/tip.git tree has other changes for the
Xen block drivers that are related to his grant work - and they do not
conflict with this git pull.


Trivial merge
Linux 6.x block layer and io_uring tree(s)