tree 125bb95bbbdb1eeab61a4f0e4fce07d49fa02fd5
parent fa3b895da8e06d6e3dcf3e6941a3fd428343e3d7
parent d28820419ca332f856cdf8bef0cafed79c29ed05
author Linus Torvalds <torvalds@linux-foundation.org> 1649565119 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1649565119 -1000
mergetag object d28820419ca332f856cdf8bef0cafed79c29ed05
 type commit
 tag cxl+nvdimm-for-5.18-rc2
 tagger Dan Williams <dan.j.williams@intel.com> 1649547417 -0700
 
 cxl + nvdimm fixes for v5.18-rc2
 
 - Fix a compile error in the nvdimm unit tests
 
 - Fix a shadowed variable warning in the CXL PCI driver
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQSbo+XnGs+rwLz9XGXfioYZHlFsZwUCYlIY6QAKCRDfioYZHlFs
 Z0aeAQDDYcicYRhLZ3Ljbg6stitBIumpdVcKDHm4WkC9gbmB4QEArnXLpcHPWyAa
 zmgc1Yrp9gOnpNSRMog9Wc8NaR45KA8=
 =Ov5t
 -----END PGP SIGNATURE-----

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