diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-22 02:12:26 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-22 02:12:26 +0300 |
| commit | 4746104a6f599f213c3d97d8c39032953fd4580f (patch) | |
| tree | 05266de13c74d137d30e4a46939ff8de16a22afc /fs/pipe.c | |
| parent | 60b04df6bfbf7e65954c44f7945b381e0fee5b6a (diff) | |
| parent | c1468554776229d0db69e74a9aaf6f7e7095fd51 (diff) | |
| download | linux-4746104a6f599f213c3d97d8c39032953fd4580f.tar.xz | |
Merge tag 'libnvdimm-fix-5.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fix from Dan Williams:
"A minor regression fix.
The libnvdimm unit tests were expecting to mock calls to
ioremap_nocache() which disappeared in v5.5-rc1. This fix has appeared
in -next and collided with some cleanups that Christoph has planned
for v5.6, but he will fix up his branch once this goes in.
Summary:
- Restore the operation of the libnvdimm unit tests after the removal
of ioremap_nocache()"
* tag 'libnvdimm-fix-5.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
tools/testing/nvdimm: Fix mock support for ioremap
Diffstat (limited to 'fs/pipe.c')
0 files changed, 0 insertions, 0 deletions