tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 94a4c2bb fa3b895d

+2 -3
-1
drivers/cxl/pci.c
··· 436 436 437 437 for (i = mbox_ready_timeout; i; i--) { 438 438 u32 temp; 439 - int rc; 440 439 441 440 rc = pci_read_config_dword( 442 441 pdev, d + CXL_DVSEC_RANGE_SIZE_LOW(0), &temp);
+2 -2
tools/testing/nvdimm/test/nfit.c
··· 1842 1842 return 0; 1843 1843 } 1844 1844 1845 - static void security_init(struct nfit_test *t) 1845 + static void nfit_security_init(struct nfit_test *t) 1846 1846 { 1847 1847 int i; 1848 1848 ··· 1938 1938 if (nfit_test_dimm_init(t)) 1939 1939 return -ENOMEM; 1940 1940 smart_init(t); 1941 - security_init(t); 1941 + nfit_security_init(t); 1942 1942 return ars_state_init(&t->pdev.dev, &t->ars_state); 1943 1943 } 1944 1944