Merge branch 'for-5.8/block' into for-next
authorJens Axboe <axboe@kernel.dk>
Thu, 14 May 2020 15:48:10 +0000 (09:48 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 14 May 2020 15:48:10 +0000 (09:48 -0600)
commit13d9194146bcd27ffb813792ac65550e71d92b71
tree001bee3515a42cdaca47ef2c9584e0526e6613d2
parentd0f077ad7ad09aa82fdc164a38b41d2bc9054f1c
parent488f6682c832e9549d28b30075f00c76328eb1be
Merge branch 'for-5.8/block' into for-next

* for-5.8/block:
  block: blk-crypto-fallback for Inline Encryption
  block: Make blk-integrity preclude hardware inline encryption
  block: Inline encryption support for blk-mq
  block: Keyslot Manager for Inline Encryption
  Documentation: Document the blk-crypto framework