Merge branch 'block-5.12' into for-next
authorJens Axboe <axboe@kernel.dk>
Tue, 2 Mar 2021 20:16:06 +0000 (13:16 -0700)
committerJens Axboe <axboe@kernel.dk>
Tue, 2 Mar 2021 20:16:06 +0000 (13:16 -0700)
commit091c66add57d4de117f4893911506713bced79a9
tree7432e902391187c825f309271def1109049c5306
parent7a7fd0de4a9804299793e564a555a49c1fc924cb
parent4168a8d27ed3a00f160e7f885c956f060d2a0741
Merge branch 'block-5.12' into for-next

* block-5.12:
  block/bfq: update comments and default value in docs for fifo_expire
  rsxx: remove unused including <linux/version.h>
  block: Drop leftover references to RQF_SORTED
  block: revert "block: fix bd_size_lock use"