From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Feb 2015 18:21:57 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: v4.0-rc2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a015d33c98e67e984718ac2a0063a051e30ec548;p=platform%2Fkernel%2Flinux-exynos.git

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

Pull block layer fixes from Jens Axboe:
 "Two smaller fixes for this cycle:

   - A fixup from Keith so that NVMe compiles without BLK_INTEGRITY,
     basically just moving the code around appropriately.

   - A fixup for shm, fixing an oops in shmem_mapping() for mapping with
     no inode.  From Sasha"

[ The shmem fix doesn't look block-layer-related, but fixes a bug that
  happened due to the backing_dev_info removal..  - Linus ]

* 'for-linus' of git://git.kernel.dk/linux-block:
  mm: shmem: check for mapping owner before dereferencing
  NVMe: Fix for BLK_DEV_INTEGRITY not set
---

a015d33c98e67e984718ac2a0063a051e30ec548