diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-20 09:58:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-20 09:58:35 -0700 |
| commit | 41a247d896d20b2b7c73ec40523d7caf058c0698 (patch) | |
| tree | e1acfa6937c408932c8d267753b8bdb448c5dc98 /usr | |
| parent | nfsd: replace Jeff by Chuck as nfsd co-maintainer (diff) | |
| parent | Merge branch 'md-fixes' of https://github.com/liu-song-6/linux into for-linus (diff) | |
| download | linux-dev-41a247d896d20b2b7c73ec40523d7caf058c0698.tar.xz linux-dev-41a247d896d20b2b7c73ec40523d7caf058c0698.zip | |
Merge tag 'for-linus-20190620' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Three fixes that should go into this series.
One is a set of two patches from Christoph, fixing a page leak on same
page merges. Boiled down version of a bigger fix, but this one is more
appropriate for this late in the cycle (and easier to backport to
stable).
The last patch is for a divide error in MD, from Mariusz (via Song)"
* tag 'for-linus-20190620' of git://git.kernel.dk/linux-block:
md: fix for divide error in status_resync
block: fix page leak when merging to same page
block: return from __bio_try_merge_page if merging occured in the same page
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions