From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Dec 2019 23:12:26 +0000 (-0800)
Subject: Merge tag 'libnvdimm-fix-5.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.10.7~3589
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4746104a6f599f213c3d97d8c39032953fd4580f;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'libnvdimm-fix-5.5-rc3' of git://git./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
---

4746104a6f599f213c3d97d8c39032953fd4580f