diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-03 22:12:16 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-03 22:12:16 +0300 |
| commit | 1e512b08da88dc2f28afb70406c5a6b2cd7531e4 (patch) | |
| tree | f713fdaa4c5ee9e817de1ede39f6035ed29e9319 /mm/swap_cgroup.c | |
| parent | 1c65ae63c061c8eb22c780d99ebcd4492743c04e (diff) | |
| parent | 758dd7fdffd60507624edce34fff122a63163b3f (diff) | |
| download | linux-1e512b08da88dc2f28afb70406c5a6b2cd7531e4.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Mainly sending this off now for the writeback fixes, since they fix a
real regression introduced with the cgroup writeback changes. The
NVMe fix could wait for next pull for this series, but it's simple
enough that we might as well include it.
This contains:
- two cgroup writeback fixes from Tejun, fixing a user reported issue
with luks crypt devices hanging when being closed.
- NVMe error cleanup fix from Jon Derrick, fixing a case where we'd
attempt to free an unregistered IRQ"
* 'for-linus' of git://git.kernel.dk/linux-block:
NVMe: Fix irq freeing when queue_request_irq fails
writeback: don't drain bdi_writeback_congested on bdi destruction
writeback: don't embed root bdi_writeback_congested in bdi_writeback
Diffstat (limited to 'mm/swap_cgroup.c')
0 files changed, 0 insertions, 0 deletions