[GIT PULL] Two fixes for 4.0-rc2

[Jens Axboe <axboe@fb.com>]

Hi Linus,

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.

Please pull!


  git://git.kernel.dk/linux-block.git for-linus

for you to fetch changes up to f0774d884bad7007b54cfffb5c93c23420c75aa6:

  mm: shmem: check for mapping owner before dereferencing (2015-02-23 10:00:11 -0800)

----------------------------------------------------------------
Keith Busch (1):
      NVMe: Fix for BLK_DEV_INTEGRITY not set

Sasha Levin (1):
      mm: shmem: check for mapping owner before dereferencing

 drivers/block/nvme-core.c | 99 +++++++++++++++++++++++++++--------------------
 mm/shmem.c                |  3 ++
 2 files changed, 61 insertions(+), 41 deletions(-)

-- 
Jens Axboe