projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fa3b895 d288204)
Merge tag 'cxl+nvdimm-for-5.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Apr 2022 04:31:59 +0000 (18:31 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 10 Apr 2022 04:31:59 +0000 (18:31 -1000)
commit94a4c2bb7a1fb95bd7105ac5685377f57c13daf3
tree125bb95bbbdb1eeab61a4f0e4fce07d49fa02fd5tree | snapshot
parentfa3b895da8e06d6e3dcf3e6941a3fd428343e3d7commit | diff
parentd28820419ca332f856cdf8bef0cafed79c29ed05commit | diff
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
Domain: System / Kernel;