Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 01:18:26 +0000 (12:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 01:18:26 +0000 (12:18 +1100)
1  2 
MAINTAINERS
block/blk-core.c
block/blk-mq-tag.c
block/blk-mq.c
block/blk-sysfs.c
drivers/md/dm.c
drivers/md/md.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/nvme/host/pci.c
fs/mpage.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
diff --cc block/blk-mq.c
Simple merge
Simple merge
diff --cc drivers/md/dm.c
Simple merge
diff --cc drivers/md/md.c
Simple merge
Simple merge
Simple merge
  #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