From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 Jan 2016 22:53:48 +0000 (-0800)
Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: v4.4~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eac6f76ac72c0a7e6f6d4f1640be751a526b5de2;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

Merge tag 'scsi-fixes' of git://git./linux/kernel/git/jejb/scsi

Pull SCSI fix from James Bottomley:
 "A single fix for machines with pages > 4k (PPC mostly).

  There's a bug in our optimal transfer size code where we don't account
  for pages > 4k and can set the transfer size to be less than the page
  size causing nasty failures"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  sd: Reject optimal transfer length smaller than page size
---

eac6f76ac72c0a7e6f6d4f1640be751a526b5de2