]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a76e0d3 1267dfe)
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)
commitddef3feb3797e9b93ff4f3ecd532e5aaaa54e359
tree125bb95bbbdb1eeab61a4f0e4fce07d49fa02fd5tree | snapshot
parenta76e0d3f349c75017a63295f00bb462a02820675commit | diff
parent1267dfee4b6e1d3042808111c87a5e44346aed51commit | diff
Merge tag 'cxl+nvdimm-for-5.18-rc2' of git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.