Merge remote-tracking branch 'block/for-next'

diff --cc MAINTAINERS
Simple merge

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

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

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

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

diff --cc drivers/md/dm.c
Simple merge

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

diff --cc drivers/md/raid1.c
Simple merge

diff --cc drivers/md/raid10.c
Simple merge

diff --cc drivers/nvme/host/pci.c
index a2b3e40f1dc5a562ab512d044a8d72f068ae8c09,264716effc6ce5d449a794f4d4effec058351c15..9f4fe3a5f41e459624ee245874c9b2d50bad2404
--- 1/drivers/block/nvme-core.c
--- 2/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@@ -40,8 -39,13 +39,13 @@@
  #include <linux/slab.h>
  #include <linux/t10-pi.h>
  #include <linux/types.h>
+ #include <linux/pr.h>
  #include <scsi/sg.h>
 -#include <asm-generic/io-64-nonatomic-lo-hi.h>
 +#include <linux/io-64-nonatomic-lo-hi.h>
+ #include <asm/unaligned.h>
+ 
+ #include <uapi/linux/nvme_ioctl.h>
+ #include "nvme.h"
  
  #define NVME_MINORS           (1U << MINORBITS)
  #define NVME_Q_DEPTH          1024

diff --cc fs/mpage.c
Simple merge