Merge tag 'for-5.3/block-20190708' of git://git.kernel.dk/linux-block

Pull block updates from Jens Axboe:
 "This is the main block updates for 5.3. Nothing earth shattering or
  major in here, just fixes, additions, and improvements all over the
  map. This contains:

   - Series of documentation fixes (Bart)

   - Optimization of the blk-mq ctx get/put (Bart)

   - null_blk removal race condition fix (Bob)

   - req/bio_op() cleanups (Chaitanya)

   - Series cleaning up the segment accounting, and request/bio mapping
     (Christoph)

   - Series cleaning up the page getting/putting for bios (Christoph)

   - block cgroup cleanups and moving it to where it is used (Christoph)

   - block cgroup fixes (Tejun)

   - Series of fixes and improvements to bcache, most notably a write
     deadlock fix (Coly)

   - blk-iolatency STS_AGAIN and accounting fixes (Dennis)

   - Series of improvements and fixes to BFQ (Douglas, Paolo)

   - debugfs_create() return value check removal for drbd (Greg)

   - Use struct_size(), where appropriate (Gustavo)

   - Two lighnvm fixes (Heiner, Geert)

   - MD fixes, including a read balance and corruption fix (Guoqing,
     Marcos, Xiao, Yufen)

   - block opal shadow mbr additions (Jonas, Revanth)

   - sbitmap compare-and-exhange improvemnts (Pavel)

   - Fix for potential bio->bi_size overflow (Ming)

   - NVMe pull requests:
       - improved PCIe suspent support (Keith Busch)
       - error injection support for the admin queue (Akinobu Mita)
       - Fibre Channel discovery improvements (James Smart)
       - tracing improvements including nvmetc tracing support (Minwoo Im)
       - misc fixes and cleanups (Anton Eidelman, Minwoo Im, Chaitanya
         Kulkarni)"

   - Various little fixes and improvements to drivers and core"

* tag 'for-5.3/block-20190708' of git://git.kernel.dk/linux-block: (153 commits)
  blk-iolatency: fix STS_AGAIN handling
  block: nr_phys_segments needs to be zero for REQ_OP_WRITE_ZEROES
  blk-mq: simplify blk_mq_make_request()
  blk-mq: remove blk_mq_put_ctx()
  sbitmap: Replace cmpxchg with xchg
  block: fix .bi_size overflow
  block: sed-opal: check size of shadow mbr
  block: sed-opal: ioctl for writing to shadow mbr
  block: sed-opal: add ioctl for done-mark of shadow mbr
  block: never take page references for ITER_BVEC
  direct-io: use bio_release_pages in dio_bio_complete
  block_dev: use bio_release_pages in bio_unmap_user
  block_dev: use bio_release_pages in blkdev_bio_end_io
  iomap: use bio_release_pages in iomap_dio_bio_end_io
  block: use bio_release_pages in bio_map_user_iov
  block: use bio_release_pages in bio_unmap_user
  block: optionally mark pages dirty in bio_release_pages
  block: move the BIO_NO_PAGE_REF check into bio_release_pages
  block: skd_main.c: Remove call to memset after dma_alloc_coherent
  block: mtip32xx: Remove call to memset after dma_alloc_coherent
  ...

diff --cc Documentation/block/bfq-iosched.txt
index b2265cf,f02163f..bbd6eb5
--- 1/Documentation/block/bfq-iosched.txt
--- 2/Documentation/block/bfq-iosched.txt
+++ b/Documentation/block/bfq-iosched.txt
@@@ -537,10 -537,10 +537,10 @@@ or io.bfq.weight
  
  As for cgroups-v1 (blkio controller), the exact set of stat files
  created, and kept up-to-date by bfq, depends on whether
- CONFIG_DEBUG_BLK_CGROUP is set. If it is set, then bfq creates all
+ CONFIG_BFQ_CGROUP_DEBUG is set. If it is set, then bfq creates all
  the stat files documented in
 -Documentation/cgroup-v1/blkio-controller.txt. If, instead,
 +Documentation/cgroup-v1/blkio-controller.rst. If, instead,
- CONFIG_DEBUG_BLK_CGROUP is not set, then bfq creates only the files
+ CONFIG_BFQ_CGROUP_DEBUG is not set, then bfq creates only the files
  blkio.bfq.io_service_bytes
  blkio.bfq.io_service_bytes_recursive
  blkio.bfq.io_serviced

diff --cc Documentation/cgroup-v1/blkio-controller.rst
Simple merge

diff --cc block/bfq-iosched.c
Simple merge

diff --cc block/blk-mq-debugfs.c
Simple merge

diff --cc drivers/block/drbd/drbd_main.c
Simple merge

diff --cc fs/io_uring.c
Simple merge

diff --cc init/Kconfig
index bf96faf,a41d8fb..d3a1df4
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -850,16 -797,8 +850,8 @@@ config BLK_CGROU
        CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
        CONFIG_BLK_DEV_THROTTLING=y.
  
 -      See Documentation/cgroup-v1/blkio-controller.txt for more information.
 +      See Documentation/cgroup-v1/blkio-controller.rst for more information.
  
- config DEBUG_BLK_CGROUP
-       bool "IO controller debugging"
-       depends on BLK_CGROUP
-       default n
-       ---help---
-       Enable some debugging help. Currently it exports additional stat
-       files in a cgroup which can be useful for debugging.
- 
  config CGROUP_WRITEBACK
        bool
        depends on MEMCG && BLK_CGROUP

diff --cc kernel/cgroup/cgroup.c
Simple merge