projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e738441 9825637)
Merge tag 'for-linus-20181218' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Dec 2018 23:47:40 +0000 (15:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Dec 2018 23:47:40 +0000 (15:47 -0800)
Pull block fix from Jens Axboe:
 "Correct an ioctl direction for the zoned ioctls"

* tag 'for-linus-20181218' of git://git.kernel.dk/linux-block:
  uapi: linux/blkzoned.h: fix BLKGETZONESZ and BLKGETNRZONES definitions


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