diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 17:21:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 17:21:53 -0800 |
| commit | cf1b3341afab9d3ad02a76b3a619ea027dcf4e28 (patch) | |
| tree | 99d5e2df998556c6ba1e9022eaa361aee74bf4a8 /mm/khugepaged.c | |
| parent | 80eabba70260dcb55b05098f6c1fecbe5c0e518b (diff) | |
| parent | d1b1cea1e58477dad88ff769f54c0d2dfa56d923 (diff) | |
| download | linux-cf1b3341afab9d3ad02a76b3a619ea027dcf4e28.tar.gz linux-cf1b3341afab9d3ad02a76b3a619ea027dcf4e28.tar.bz2 linux-cf1b3341afab9d3ad02a76b3a619ea027dcf4e28.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block IO fixes from Jens Axboe:
"A few fixes that I collected as post-merge.
I was going to wait a bit with sending this out, but the O_DIRECT fix
should really go in sooner rather than later"
* 'for-linus' of git://git.kernel.dk/linux-block:
blk-mq: Fix failed allocation path when mapping queues
blk-mq: Avoid memory reclaim when remapping queues
block_dev: don't update file access position for sync direct IO
nvme/pci: Log PCI_STATUS when the controller dies
block_dev: don't test bdev->bd_contains when it is not stable
Diffstat (limited to 'mm/khugepaged.c')
0 files changed, 0 insertions, 0 deletions