Commit 94a4c2bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents fa3b895d d2882041

drivers/cxl/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -436,7 +436,6 @@ static int wait_for_media_ready(struct cxl_dev_state *cxlds) 


	for (i = mbox_ready_timeout; i; i--) {

		u32 temp;

		int rc;



		rc = pci_read_config_dword(

			pdev, d + CXL_DVSEC_RANGE_SIZE_LOW(0), &temp);

tools/testing/nvdimm/test/nfit.c

+2 −2
Original line number Diff line number Diff line
@@ -1842,7 +1842,7 @@ static int nfit_test_dimm_init(struct nfit_test *t) 
	return 0;

}



static void security_init(struct nfit_test *t)

static void nfit_security_init(struct nfit_test *t)

{

	int i;
@@ -1938,7 +1938,7 @@ static int nfit_test0_alloc(struct nfit_test *t) 
	if (nfit_test_dimm_init(t))

		return -ENOMEM;

	smart_init(t);

	security_init(t);

	nfit_security_init(t);

	return ars_state_init(&t->pdev.dev, &t->ars_state);

}