Merge branch 'for-linus' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Feb 2015 18:21:57 +0000 (10:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Feb 2015 18:21:57 +0000 (10:21 -0800)
commita015d33c98e67e984718ac2a0063a051e30ec548
tree374d42ecb0626c18f07475b27d34743b6ffd4978
parent2aaeb784bf3af6afe4084199dba9fcfb57ce5acc
parentf0774d884bad7007b54cfffb5c93c23420c75aa6
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