Merge branch 'for-7.1/cxl-misc' into cxl-for-next (6c724ce0) · Commits · git / linux-net

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,7 @@ John Stultz <johnstul@us.ibm.com>
		<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
		<jon.toppins+linux@gmail.com> <jtoppins@redhat.com>
		Jonas Gorski <jonas.gorski@gmail.com> <jogo@openwrt.org>
		Jonathan Cameron <jic23@kernel.org> <jonathan.cameron@huawei.com>
		Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>
		<josh@joshtriplett.org> <josh@freedesktop.org>
		<josh@joshtriplett.org> <josh@kernel.org>

+4 −4

Original line number	Diff line number	Diff line
		@@ -6424,7 +6424,7 @@ F: include/linux/compiler_attributes.h

		COMPUTE EXPRESS LINK (CXL)
		M: Davidlohr Bueso <dave@stgolabs.net>
		M: Jonathan Cameron <jonathan.cameron@huawei.com>
		M: Jonathan Cameron <jic23@kernel.org>
		M: Dave Jiang <dave.jiang@intel.com>
		M: Alison Schofield <alison.schofield@intel.com>
		M: Vishal Verma <vishal.l.verma@intel.com>
		@@ -6440,7 +6440,7 @@ F: include/uapi/linux/cxl_mem.h
		F: tools/testing/cxl/

		COMPUTE EXPRESS LINK PMU (CPMU)
		M: Jonathan Cameron <jonathan.cameron@huawei.com>
		M: Jonathan Cameron <jic23@kernel.org>
		L: linux-cxl@vger.kernel.org
		S: Maintained
		F: Documentation/admin-guide/perf/cxl.rst
		@@ -10524,7 +10524,7 @@ FWCTL SUBSYSTEM
		M: Dave Jiang <dave.jiang@intel.com>
		M: Jason Gunthorpe <jgg@nvidia.com>
		M: Saeed Mahameed <saeedm@nvidia.com>
		R: Jonathan Cameron <Jonathan.Cameron@huawei.com>
		R: Jonathan Cameron <jic23@kernel.org>
		S: Maintained
		F: Documentation/userspace-api/fwctl/
		F: drivers/fwctl/
		@@ -25136,7 +25136,7 @@ F: drivers/staging/

		STANDALONE CACHE CONTROLLER DRIVERS
		M: Conor Dooley <conor@kernel.org>
		M: Jonathan Cameron <jonathan.cameron@huawei.com>
		M: Jonathan Cameron <jic23@kernel.org>
		S: Maintained
		T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
		F: Documentation/devicetree/bindings/cache/