[GIT,PULL] Block fixes for 5.14-rc6

Pull-request

git://git.kernel.dk/linux-block.git tags/block-5.14-2021-08-13

Message

Jens Axboe Aug. 13, 2021, 7:12 p.m. UTC

Hi Linus,

A few fixes for block that should go into 5.14:

- Revert the mq-deadline cgroup addition. More work is needed on this
  front, let's revert it for now and get it right before having it in a
  released kernel (Tejun)

- blk-iocost lockdep fix (Ming)

- nbd double completion fix (Xie)

- Fix for non-idling when clearing the shared tag flag (Yu)

Please pull!


The following changes since commit fb7b9b0231ba8f77587c23f5257a4fdb6df1219e:

  kyber: make trace_block_rq call consistent with documentation (2021-08-06 16:40:47 -0600)

are available in the Git repository at:

  git://git.kernel.dk/linux-block.git tags/block-5.14-2021-08-13

for you to fetch changes up to cddce01160582a5f52ada3da9626c052d852ec42:

  nbd: Aovid double completion of a request (2021-08-13 09:46:48 -0600)

----------------------------------------------------------------
block-5.14-2021-08-13

----------------------------------------------------------------
Ming Lei (1):
      blk-iocost: fix lockdep warning on blkcg->lock

Tejun Heo (1):
      Revert "block/mq-deadline: Add cgroup support"

Xie Yongji (1):
      nbd: Aovid double completion of a request

Yu Kuai (1):
      blk-mq: clear active_queues before clearing BLK_MQ_F_TAG_QUEUE_SHARED

 block/Kconfig.iosched                       |   6 --
 block/Makefile                              |   2 -
 block/blk-iocost.c                          |   8 +-
 block/blk-mq.c                              |   6 +-
 block/mq-deadline-cgroup.c                  | 126 ----------------------------
 block/mq-deadline-cgroup.h                  | 114 -------------------------
 block/{mq-deadline-main.c => mq-deadline.c} |  73 ++++------------
 drivers/block/nbd.c                         |  14 +++-
 8 files changed, 33 insertions(+), 316 deletions(-)
 delete mode 100644 block/mq-deadline-cgroup.c
 delete mode 100644 block/mq-deadline-cgroup.h
 rename block/{mq-deadline-main.c => mq-deadline.c} (95%)

Comments

[e-mail] Aug. 14, 2021, 1:12 a.m. UTC | #1

The pull request you sent on Fri, 13 Aug 2021 13:12:48 -0600:

> git://git.kernel.dk/linux-block.git tags/block-5.14-2021-08-13

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/020efdadd84958debc36e74fb5cc52b30697a611

Thank you!