From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Jan 2019 20:42:41 +0000 (-0800)
Subject: Merge tag 'for-linus-20190125' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.15~7102
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b8f9159166545e576b2bc8a0c984beaeae9cc05;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-linus-20190125' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "A collection of fixes for this release. This contains:

   - Silence sparse rightfully complaining about non-static wbt
     functions (Bart)

   - Fixes for the zoned comments/ioctl documentation (Damien)

   - direct-io fix that's been lingering for a while (Ernesto)

   - cgroup writeback fix (Tejun)

   - Set of NVMe patches for nvme-rdma/tcp (Sagi, Hannes, Raju)

   - Block recursion tracking fix (Ming)

   - Fix debugfs command flag naming for a few flags (Jianchao)"

* tag 'for-linus-20190125' of git://git.kernel.dk/linux-block:
  block: Fix comment typo
  uapi: fix ioctl documentation
  blk-wbt: Declare local functions static
  blk-mq: fix the cmd_flag_name array
  nvme-multipath: drop optimization for static ANA group IDs
  nvmet-rdma: fix null dereference under heavy load
  nvme-rdma: rework queue maps handling
  nvme-tcp: fix timeout handler
  nvme-rdma: fix timeout handler
  writeback: synchronize sync(2) against cgroup writeback membership switches
  block: cover another queue enter recursion via BIO_QUEUE_ENTERED
  direct-io: allow direct writes to empty inodes
---

6b8f9159166545e576b2bc8a0c984beaeae9cc05