Merge branch 'for-4.11/next' into for-4.11/linus-merge

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --cc block/Kconfig
Simple merge

diff --cc block/Makefile
Simple merge

diff --cc block/bio.c
Simple merge

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

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

diff --cc block/elevator.c
Simple merge

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

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

diff --cc drivers/block/xen-blkfront.c
Simple merge

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

diff --cc drivers/cdrom/gdrom.c
Simple merge

diff --cc drivers/ide/ide-cd.c
Simple merge

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

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

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

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

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

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

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

diff --cc drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 0b5b423,75f3fce..c6d5505
--- 1/drivers/scsi/mpt3sas/mpt3sas_scsih.c
--- 2/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@@ -4717,20 -4715,6 +4717,20 @@@ _scsih_io_done(struct MPT3SAS_ADAPTER *
        }
  
        xfer_cnt = le32_to_cpu(mpi_reply->TransferCount);
-       if (unlikely(scmd->request->cmd_type == REQ_TYPE_FS && sector_sz &&
 +
 +      /* In case of bogus fw or device, we could end up having
 +       * unaligned partial completion. We can force alignment here,
 +       * then scsi-ml does not need to handle this misbehavior.
 +       */
 +      sector_sz = scmd->device->sector_size;
++      if (unlikely(!blk_rq_is_passthrough(scmd->request) && sector_sz &&
 +                   xfer_cnt % sector_sz)) {
 +              sdev_printk(KERN_INFO, scmd->device,
 +                  "unaligned partial completion avoided (xfer_cnt=%u, sector_sz=%u)\n",
 +                          xfer_cnt, sector_sz);
 +              xfer_cnt = round_down(xfer_cnt, sector_sz);
 +      }
 +
        scsi_set_resid(scmd, scsi_bufflen(scmd) - xfer_cnt);
        if (ioc_status & MPI2_IOCSTATUS_FLAG_LOG_INFO_AVAILABLE)
                log_info =  le32_to_cpu(mpi_reply->IOCLogInfo);

diff --cc drivers/scsi/qla2xxx/qla_isr.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/sr.c
Simple merge

diff --cc fs/block_dev.c
Simple merge

diff --cc fs/xfs/xfs_buf.c
Simple merge

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