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

Pull misc block fixes from Jens Axboe:
 "Stuff that got collected after the merge window opened.  This
  contains:

   - NVMe:
        - Fix for non-striped transfer size setting for NVMe from
          Sathyavathi.
        - (Some) support for the weird Apple nvme controller in the
          macbooks. From Stephan Günther.

   - The error value leak for dax from Al.

   - A few minor blk-mq tweaks from me.

   - Add the new linux-block@vger.kernel.org mailing list to the
     MAINTAINERS file.

   - Discard fix for brd, from Jan.

   - A kerneldoc warning for block core from Randy.

   - An older fix from Vivek, converting a WARN_ON() to a rate limited
     printk when a device is hot removed with dirty inodes"

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: don't hardcode blk_qc_t -> tag mask
  dax_io(): don't let non-error value escape via retval instead of EFAULT
  block: fix blk-core.c kernel-doc warning
  fs/block_dev.c: Remove WARN_ON() when inode writeback fails
  NVMe: add support for Apple NVMe controller
  NVMe: use split lo_hi_{read,write}q
  blk-mq: mark __blk_mq_complete_request() static
  MAINTAINERS: add reference to new linux-block list
  NVMe: Increase the max transfer size when mdts is 0
  brd: Refuse improperly aligned discard requests

diff --combined MAINTAINERS
index 8d941d6818cd287314dcf7b0554f07172f875edd,372ee63c0099684ae33b6dbab8c6a7d0a786a5f9..ecc43c255eb8d73722f885c4487b253ce575747d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2210,6 -2210,7 +2210,7 @@@ F:      drivers/leds/leds-blinkm.
  
  BLOCK LAYER
  M:    Jens Axboe <axboe@kernel.dk>
+ L:    linux-block@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    block/
@@@ -5505,8 -5506,7 +5506,8 @@@ S:      Supporte
  F:    drivers/idle/intel_idle.c
  
  INTEL PSTATE DRIVER
 -M:    Kristen Carlson Accardi <kristen@linux.intel.com>
 +M:    Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
 +M:    Len Brown <lenb@kernel.org>
  L:    linux-pm@vger.kernel.org
  S:    Supported
  F:    drivers/cpufreq/intel_pstate.c

diff --combined fs/dax.c
index 131fd35ae39d53f8a9ef7bdd1aaa61677beda5f0,7b653e9aa8d1cee30e2b157cc407f947675bda64..8e17b371aeb894620ac2cc5d7a7e2aaee7095310
--- 1/fs/dax.c
--- 2/fs/dax.c
+++ b/fs/dax.c
@@@ -29,11 -29,6 +29,11 @@@
  #include <linux/uio.h>
  #include <linux/vmstat.h>
  
 +/*
 + * dax_clear_blocks() is called from within transaction context from XFS,
 + * and hence this means the stack from this point must follow GFP_NOFS
 + * semantics for all operations.
 + */
  int dax_clear_blocks(struct inode *inode, sector_t block, long size)
  {
        struct block_device *bdev = inode->i_sb->s_bdev;
@@@ -174,8 -169,10 +174,10 @@@ static ssize_t dax_io(struct inode *ino
                else
                        len = iov_iter_zero(max - pos, iter);
  
-               if (!len)
+               if (!len) {
+                       retval = -EFAULT;
                        break;
+               }
  
                pos += len;
                addr += len;