Skip to content
  • Jens Axboe's avatar
    Merge branch 'for-linus' into for-5.5/block · 912c0a85
    Jens Axboe authored
    Pull on for-linus to resolve what otherwise would have been a conflict
    with the cgroups rstat patchset from Tejun.
    
    * for-linus: (942 commits)
      blkcg: make blkcg_print_stat() print stats only for online blkgs
      nvme: change nvme_passthru_cmd64 to explicitly mark rsvd
      nvme-multipath: fix crash in nvme_mpath_clear_ctrl_paths
      nvme-rdma: fix a segmentation fault during module unload
      iocost: don't nest spin_lock_irq in ioc_weight_write()
      io_uring: ensure we clear io_kiocb->result before each issue
      um-ubd: Entrust re-queue to the upper layers
      nvme-multipath: remove unused groups_only mode in ana log
      nvme-multipath: fix possible io hang after ctrl reconnect
      io_uring: don't touch ctx in setup after ring fd install
      io_uring: Fix leaked shadow_req
      Linux 5.4-rc5
      riscv: cleanup do_trap_break
      nbd: verify socket is supported during setup
      ata: libahci_platform: Fix regulator_get_optional() misuse
      nbd: handle racing with error'ed out commands
      nbd: protect cmd->status with cmd->lock
      io_uring: fix bad inflight accounting for SETUP_IOPOLL|SETUP_SQTHREAD
      io_uring: used cached copies of sq->dropped and cq->overflow
      ARM: dts: stm32: relax qspi pins slew-rate for stm32mp157
      ...
    912c0a85