From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 10 Apr 2022 04:31:59 +0000 (-1000)
Subject: Merge tag 'cxl+nvdimm-for-5.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.1-rc5~1583
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=94a4c2bb7a1fb95bd7105ac5685377f57c13daf3;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'cxl+nvdimm-for-5.18-rc2' of git://git./linux/kernel/git/nvdimm/nvdimm

Pull cxl and nvdimm fixes from Dan Williams:

 - Fix a compile error in the nvdimm unit tests

 - Fix a shadowed variable warning in the CXL PCI driver

* tag 'cxl+nvdimm-for-5.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  cxl/pci: Drop shadowed variable
  tools/testing/nvdimm: Fix security_init() symbol collision
---

94a4c2bb7a1fb95bd7105ac5685377f57c13daf3