diff options
author | Jens Axboe <axboe@kernel.dk> | 2019-10-18 08:49:25 -0600 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2019-10-18 08:49:25 -0600 |
commit | b55f0097ae1da2520108bc426275c1ec5f857b78 (patch) | |
tree | 0ed62bcc747e4f9d2872145c24f8f2e9fc043d75 /mm/khugepaged.c | |
parent | 8b07a65ad30e5612d9590fb50468ff4fa314cfc7 (diff) | |
parent | a4f40484e7f1dff56bb9f286cc59ffa36e0259eb (diff) | |
download | linux-b55f0097ae1da2520108bc426275c1ec5f857b78.tar.bz2 |
Merge branch 'nvme-5.4' of git://git.infradead.org/nvme into for-linus
Pull NVMe updates from Keith:
"This is a collection of bug fixes committed since the previous pull
request that address deadlocks, double resets, memory leaks, and other
regression."
* 'nvme-5.4' of git://git.infradead.org/nvme:
nvme-pci: Set the prp2 correctly when using more than 4k page
nvme-tcp: fix possible leakage during error flow
nvmet-loop: fix possible leakage during error flow
nvme-tcp: Initialize sk->sk_ll_usec only with NET_RX_BUSY_POLL
nvme: Wait for reset state when required
nvme: Prevent resets during paused controller state
nvme: Restart request timers in resetting state
nvme: Remove ADMIN_ONLY state
nvme-pci: Free tagset if no IO queues
nvme: retain split access workaround for capability reads
nvme: fix possible deadlock when nvme_update_formats fails
Diffstat (limited to 'mm/khugepaged.c')
0 files changed, 0 insertions, 0 deletions