Merge tag 'for-5.4/block-2019-09-16' of git://git.kernel.dk/linux-block

Pull block updates from Jens Axboe:

 - Two NVMe pull requests:
     - ana log parse fix from Anton
     - nvme quirks support for Apple devices from Ben
     - fix missing bio completion tracing for multipath stack devices
       from Hannes and Mikhail
     - IP TOS settings for nvme rdma and tcp transports from Israel
     - rq_dma_dir cleanups from Israel
     - tracing for Get LBA Status command from Minwoo
     - Some nvme-tcp cleanups from Minwoo, Potnuri and Myself
     - Some consolidation between the fabrics transports for handling
       the CAP register
     - reset race with ns scanning fix for fabrics (move fabrics
       commands to a dedicated request queue with a different lifetime
       from the admin request queue)."
     - controller reset and namespace scan races fixes
     - nvme discovery log change uevent support
     - naming improvements from Keith
     - multiple discovery controllers reject fix from James
     - some regular cleanups from various people

 - Series fixing (and re-fixing) null_blk debug printing and nr_devices
   checks (André)

 - A few pull requests from Song, with fixes from Andy, Guoqing,
   Guilherme, Neil, Nigel, and Yufen.

 - REQ_OP_ZONE_RESET_ALL support (Chaitanya)

 - Bio merge handling unification (Christoph)

 - Pick default elevator correctly for devices with special needs
   (Damien)

 - Block stats fixes (Hou)

 - Timeout and support devices nbd fixes (Mike)

 - Series fixing races around elevator switching and device add/remove
   (Ming)

 - sed-opal cleanups (Revanth)

 - Per device weight support for BFQ (Fam)

 - Support for blk-iocost, a new model that can properly account cost of
   IO workloads. (Tejun)

 - blk-cgroup writeback fixes (Tejun)

 - paride queue init fixes (zhengbin)

 - blk_set_runtime_active() cleanup (Stanley)

 - Block segment mapping optimizations (Bart)

 - lightnvm fixes (Hans/Minwoo/YueHaibing)

 - Various little fixes and cleanups

* tag 'for-5.4/block-2019-09-16' of git://git.kernel.dk/linux-block: (186 commits)
  null_blk: format pr_* logs with pr_fmt
  null_blk: match the type of parameter nr_devices
  null_blk: do not fail the module load with zero devices
  block: also check RQF_STATS in blk_mq_need_time_stamp()
  block: make rq sector size accessible for block stats
  bfq: Fix bfq linkage error
  raid5: use bio_end_sector in r5_next_bio
  raid5: remove STRIPE_OPS_REQ_PENDING
  md: add feature flag MD_FEATURE_RAID0_LAYOUT
  md/raid0: avoid RAID0 data corruption due to layout confusion.
  raid5: don't set STRIPE_HANDLE to stripe which is in batch list
  raid5: don't increment read_errors on EILSEQ return
  nvmet: fix a wrong error status returned in error log page
  nvme: send discovery log page change events to userspace
  nvme: add uevent variables for controller devices
  nvme: enable aen regardless of the presence of I/O queues
  nvme-fabrics: allow discovery subsystems accept a kato
  nvmet: Use PTR_ERR_OR_ZERO() in nvmet_init_discovery()
  nvme: Remove redundant assignment of cq vector
  nvme: Assign subsys instance from first ctrl
  ...

diff --cc Documentation/admin-guide/cgroup-v2.rst
Simple merge

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

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

diff --cc block/blk-sysfs.c
Simple merge

diff --cc drivers/block/loop.c
Simple merge

diff --cc drivers/md/bcache/sysfs.c
Simple merge

diff --cc drivers/nvme/host/core.c
Simple merge

diff --cc drivers/nvme/host/multipath.c
Simple merge

diff --cc drivers/nvme/host/nvme.h
index 2d678fb968c745598e20a6b4ca3a839ae425dd5c,a818313a1f15c87d1bccf5f18c8be4f867a20a42..b5013c101b352845de6fa977b279b9571f470e61
--- 1/drivers/nvme/host/nvme.h
--- 2/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@@ -93,10 -95,20 +95,25 @@@ enum nvme_quirks 
         */
        NVME_QUIRK_DISABLE_WRITE_ZEROES         = (1 << 9),
  
 -      NVME_QUIRK_SINGLE_VECTOR                = (1 << 10),
 +      /*
 +       * Force simple suspend/resume path.
 +       */
 +      NVME_QUIRK_SIMPLE_SUSPEND               = (1 << 10),
++
+       /*
+        * Use only one interrupt vector for all queues
+        */
 -      NVME_QUIRK_128_BYTES_SQES               = (1 << 11),
++      NVME_QUIRK_SINGLE_VECTOR                = (1 << 11),
+ 
+       /*
+        * Use non-standard 128 bytes SQEs.
+        */
 -      NVME_QUIRK_SHARED_TAGS                  = (1 << 12),
++      NVME_QUIRK_128_BYTES_SQES               = (1 << 12),
+ 
+       /*
+        * Prevent tag overlap between queues
+        */
++      NVME_QUIRK_SHARED_TAGS                  = (1 << 13),
  };
  
  /*

diff --cc drivers/nvme/host/pci.c
Simple merge

diff --cc drivers/nvme/host/rdma.c
Simple merge

diff --cc drivers/nvme/target/loop.c
Simple merge

diff --cc include/linux/memcontrol.h
Simple merge

diff --cc mm/memcontrol.c
Simple merge