]> www.infradead.org Git - users/hch/block.git/commitdiff
projects / users / hch / block.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f225bb 20f01f1)
Merge branch 'for-5.18/block' into for-next
authorJens Axboe <axboe@kernel.dk>
Mon, 28 Feb 2022 13:40:29 +0000 (06:40 -0700)
committerJens Axboe <axboe@kernel.dk>
Mon, 28 Feb 2022 13:40:29 +0000 (06:40 -0700)
* for-5.18/block:
  blk-crypto: show crypto capabilities in sysfs
  block: don't delete queue kobject before its children
  block: simplify calling convention of elv_unregister_queue()

1  2 
block/elevator.c patch | diff1 | diff2 | blob | history
include/linux/blkdev.h patch | diff1 | diff2 | blob | history

diff --cc block/elevator.c
Simple merge
diff --cc include/linux/blkdev.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.