From 7f8c4f547879c9ae4899e77396e5d103f72edbf7 Mon Sep 17 00:00:00 2001
From: Vlastimil Babka <vbabka@suse.cz>
Date: Apr 13 2022 09:26:27 +0000
Subject: Merge branch 'users/tiwai/SLE15-SP4-GA/for-next' into SLE15-SP4-GA


Pull supported.conf update from Joey Lee via Takashi Iwai.

---

diff --git a/supported.conf b/supported.conf
index c5c360e..d51dd15 100644
--- a/supported.conf
+++ b/supported.conf
@@ -593,9 +593,9 @@
 		drivers/cxl/cxl_pci
 		drivers/cxl/cxl_pmem
 		drivers/dax/dax							# armv7hl
--		drivers/dax/dax_hmem
+		drivers/dax/dax_hmem
 		drivers/dax/device_dax
--		drivers/dax/kmem
+		drivers/dax/kmem
 		drivers/dax/pmem/dax_pmem
 		drivers/dax/pmem/dax_pmem_compat
 		drivers/dax/pmem/dax_pmem_core