diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-21 15:12:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-21 15:12:26 -0800 |
| commit | 4746104a6f599f213c3d97d8c39032953fd4580f (patch) | |
| tree | 05266de13c74d137d30e4a46939ff8de16a22afc /include/net | |
| parent | Merge tag 's390-5.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (diff) | |
| parent | tools/testing/nvdimm: Fix mock support for ioremap (diff) | |
| download | linux-dev-4746104a6f599f213c3d97d8c39032953fd4580f.tar.xz linux-dev-4746104a6f599f213c3d97d8c39032953fd4580f.zip | |
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 'include/net')
0 files changed, 0 insertions, 0 deletions