diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-28 10:21:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-28 10:21:57 -0800 |
| commit | a015d33c98e67e984718ac2a0063a051e30ec548 (patch) | |
| tree | 374d42ecb0626c18f07475b27d34743b6ffd4978 /kernel | |
| parent | Merge tag 'xfs-for-linus-4.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs (diff) | |
| parent | mm: shmem: check for mapping owner before dereferencing (diff) | |
| download | linux-dev-a015d33c98e67e984718ac2a0063a051e30ec548.tar.xz linux-dev-a015d33c98e67e984718ac2a0063a051e30ec548.zip | |
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions