kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1

* Wed Jun 03 2020 CKI@GitLab <cki-project@redhat.com> [5.8.0-0.rc0.20200603gitd6f9469a03d8.1]
- d6f9469a03d8 rebase
- Fix configs for Fedora ("Justin M. Forbes")
- Fix update_scripts.sh unselective pattern sub (David Howells)
- Updated changelog for the release based on b0c3ba31be3e ("CKI@GitLab")
- Drop the static path configuration for the Sphinx docs (Jeremy Cline)
- Sign off generated configuration patches (Jeremy Cline)
- Use __make macro instead of make (Tom Stellard)
- redhat/configs: Enable CONFIG_SMC91X and disable CONFIG_SMC911X (Prarit Bhargava) [http://bugzilla.redhat.com/1722136]
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

58 files changed, 461 insertions, 2261 deletions

diff --git a/0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch b/0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch
index ec362d9b2..1a5bec6ce 100644
--- a/0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch
+++ b/0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch
@@ -48,7 +48,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
-index 822402480f7d..3f87d8602560 100644
+index 953a2fae8b15..7ea07f7da582 100644
 --- a/drivers/acpi/apei/hest.c
 +++ b/drivers/acpi/apei/hest.c
 @@ -88,6 +88,14 @@ int apei_hest_parse(apei_hest_func_t func, void *data)
diff --git a/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch b/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch
index 86cbf5dad..1cd552bf4 100644
--- a/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch
+++ b/0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch
@@ -28,7 +28,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index 6d3448895382..221255007dc8 100644
+index 5287ab98b8c1..3b5cc5f281c0 100644
 --- a/drivers/acpi/scan.c
 +++ b/drivers/acpi/scan.c
 @@ -1563,6 +1563,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
diff --git a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch
index e188b5a2d..48c4e0620 100644
--- a/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch
+++ b/0001-acpi-prefer-booting-with-ACPI-over-DTS.patch
@@ -39,10 +39,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
-index a100483b47c4..29f693734edb 100644
+index 46ec402e97ed..be65df48588f 100644
 --- a/arch/arm64/kernel/acpi.c
 +++ b/arch/arm64/kernel/acpi.c
-@@ -39,7 +39,7 @@ int acpi_pci_disabled = 1;	/* skip ACPI PCI scan and IRQ initialization */
+@@ -40,7 +40,7 @@ int acpi_pci_disabled = 1;	/* skip ACPI PCI scan and IRQ initialization */
  EXPORT_SYMBOL(acpi_pci_disabled);
 
  static bool param_acpi_off __initdata;
diff --git a/0001-acr-Use-kmemdup-instead-of-kmalloc-and-memcpy.patch b/0001-acr-Use-kmemdup-instead-of-kmalloc-and-memcpy.patch
deleted file mode 100644
index 9470c4608..000000000
--- a/0001-acr-Use-kmemdup-instead-of-kmalloc-and-memcpy.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zou Wei <zou_wei@huawei.com>
-Date: Tue, 21 Apr 2020 20:37:31 +0800
-Subject: [PATCH] acr: Use kmemdup instead of kmalloc and memcpy
-
-Fixes coccicheck warning:
-
-drivers/gpu/drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c:103:23-30: WARNING opportunity for kmemdup
-drivers/gpu/drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c:113:22-29: WARNING opportunity for kmemdup
-
-Fixes: 22dcda45a3d1 ("drivers/gpu/drm/nouveau/acr: implement new subdev to replace "secure boot"")
-Reported-by: Hulk Robot <hulkci@huawei.com>
-Signed-off-by: Zou Wei <zou_wei@huawei.com>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c
-index aecce2dac558..667fa016496e 100644
---- a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/hsfw.c
-@@ -100,25 +100,21 @@ nvkm_acr_hsfw_load_image(struct nvkm_acr *acr, const char *name, int ver,
- 	hsfw->data_size = lhdr->data_size;
-
- 	hsfw->sig.prod.size = fwhdr->sig_prod_size;
--	hsfw->sig.prod.data = kmalloc(hsfw->sig.prod.size, GFP_KERNEL);
-+	hsfw->sig.prod.data = kmemdup(fw->data + fwhdr->sig_prod_offset + sig,
-+				      hsfw->sig.prod.size, GFP_KERNEL);
- 	if (!hsfw->sig.prod.data) {
- 		ret = -ENOMEM;
- 		goto done;
- 	}
-
--	memcpy(hsfw->sig.prod.data, fw->data + fwhdr->sig_prod_offset + sig,
--	       hsfw->sig.prod.size);
--
- 	hsfw->sig.dbg.size = fwhdr->sig_dbg_size;
--	hsfw->sig.dbg.data = kmalloc(hsfw->sig.dbg.size, GFP_KERNEL);
-+	hsfw->sig.dbg.data = kmemdup(fw->data + fwhdr->sig_dbg_offset + sig,
-+				     hsfw->sig.dbg.size, GFP_KERNEL);
- 	if (!hsfw->sig.dbg.data) {
- 		ret = -ENOMEM;
- 		goto done;
- 	}
-
--	memcpy(hsfw->sig.dbg.data, fw->data + fwhdr->sig_dbg_offset + sig,
--	       hsfw->sig.dbg.size);
--
- 	hsfw->sig.patch_loc = loc;
- done:
- 	nvkm_firmware_put(fw);
--- 
-2.26.2
-
diff --git a/0001-add-pci_hw_vendor_status.patch b/0001-add-pci_hw_vendor_status.patch
index ebd330296..0cc7c54e7 100644
--- a/0001-add-pci_hw_vendor_status.patch
+++ b/0001-add-pci_hw_vendor_status.patch
@@ -30,7 +30,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  2 files changed, 33 insertions(+)
 
 diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
-index 0454ca0e4e3f..5cc490b821be 100644
+index da6510af1221..2ec02cbfda72 100644
 --- a/drivers/pci/pci-driver.c
 +++ b/drivers/pci/pci-driver.c
 @@ -18,6 +18,7 @@
diff --git a/0001-bpf-Add-tech-preview-taint-for-syscall.patch b/0001-bpf-Add-tech-preview-taint-for-syscall.patch
index 7f1de1099..81734460b 100644
--- a/0001-bpf-Add-tech-preview-taint-for-syscall.patch
+++ b/0001-bpf-Add-tech-preview-taint-for-syscall.patch
@@ -27,10 +27,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 77ecd8b47d70..759670262445 100644
+index cf20a460c82c..50f92fb4e6fe 100644
 --- a/kernel/bpf/syscall.c
 +++ b/kernel/bpf/syscall.c
-@@ -3698,11 +3698,17 @@ static int link_update(union bpf_attr *attr)
+@@ -3701,11 +3701,17 @@ static int link_update(union bpf_attr *attr)
  SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size)
  {
  	union bpf_attr attr;
diff --git a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
index 5641f2f78..8fa586555 100644
--- a/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
+++ b/0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch
@@ -66,7 +66,7 @@ index c041d4e950f4..8588bb62e74c 100644
  #define TAINT_FLAGS_COUNT		32
 
 diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 4e6dee19a668..77ecd8b47d70 100644
+index 42c7a42fc9c8..cf20a460c82c 100644
 --- a/kernel/bpf/syscall.c
 +++ b/kernel/bpf/syscall.c
 @@ -24,6 +24,7 @@
@@ -75,9 +75,9 @@ index 4e6dee19a668..77ecd8b47d70 100644
  #include <linux/audit.h>
 +#include <linux/init.h>
  #include <uapi/linux/btf.h>
+ #include <asm/pgtable.h>
  #include <linux/bpf_lsm.h>
-
-@@ -43,7 +44,25 @@ static DEFINE_SPINLOCK(prog_idr_lock);
+@@ -44,7 +45,25 @@ static DEFINE_SPINLOCK(prog_idr_lock);
  static DEFINE_IDR(map_idr);
  static DEFINE_SPINLOCK(map_idr_lock);
 
diff --git a/0001-core-memory-remove-redundant-assignments-to-variable.patch b/0001-core-memory-remove-redundant-assignments-to-variable.patch
deleted file mode 100644
index d490d68d2..000000000
--- a/0001-core-memory-remove-redundant-assignments-to-variable.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.king@canonical.com>
-Date: Sat, 29 Feb 2020 00:53:07 +0000
-Subject: [PATCH] core/memory: remove redundant assignments to variable ret
-
-The variable ret is being initialized with a value that is never
-read and it is being updated later with a new value. The initialization
-is redundant and can be removed.
-
-Addresses-Coverity: ("Unused value")
-Signed-off-by: Colin Ian King <colin.king@canonical.com>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/nvkm/core/memory.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/core/memory.c b/drivers/gpu/drm/nouveau/nvkm/core/memory.c
-index 4cc186262d34..38130ef272d6 100644
---- a/drivers/gpu/drm/nouveau/nvkm/core/memory.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/core/memory.c
-@@ -140,7 +140,7 @@ nvkm_memory_new(struct nvkm_device *device, enum nvkm_memory_target target,
- {
- 	struct nvkm_instmem *imem = device->imem;
- 	struct nvkm_memory *memory;
--	int ret = -ENOSYS;
-+	int ret;
-
- 	if (unlikely(target != NVKM_MEM_TARGET_INST || !imem))
- 		return -ENOSYS;
--- 
-2.26.2
-
diff --git a/0001-device-detect-if-changing-endianness-failed.patch b/0001-device-detect-if-changing-endianness-failed.patch
deleted file mode 100644
index 1089b7e87..000000000
--- a/0001-device-detect-if-changing-endianness-failed.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Karol Herbst <kherbst@redhat.com>
-Date: Tue, 28 Apr 2020 18:54:03 +0200
-Subject: [PATCH] device: detect if changing endianness failed
-
-v2: relax the checks a little
-
-Signed-off-by: Karol Herbst <kherbst@redhat.com>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- .../gpu/drm/nouveau/nvkm/engine/device/base.c | 26 +++++++++++++++----
- 1 file changed, 21 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-index 37589f36546d..c732074bf790 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-@@ -2924,6 +2924,20 @@ nvkm_device_del(struct nvkm_device **pdevice)
- 	}
- }
-
-+static inline bool
-+nvkm_device_endianness(void __iomem *pri)
-+{
-+	u32 boot1 = ioread32_native(pri + 0x000004) & 0x01000001;
-+#ifdef __BIG_ENDIAN
-+	if (!boot1)
-+		return false;
-+#else
-+	if (boot1)
-+		return false;
-+#endif
-+	return true;
-+}
-+
- int
- nvkm_device_ctor(const struct nvkm_device_func *func,
- 		 const struct nvkm_device_quirk *quirk,
-@@ -2973,13 +2987,15 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- 	/* identify the chipset, and determine classes of subdev/engines */
- 	if (detect) {
- 		/* switch mmio to cpu's native endianness */
--#ifndef __BIG_ENDIAN
--		if (ioread32_native(map + 0x000004) != 0x00000000) {
--#else
--		if (ioread32_native(map + 0x000004) == 0x00000000) {
--#endif
-+		if (!nvkm_device_endianness(map)) {
- 			iowrite32_native(0x01000001, map + 0x000004);
- 			ioread32_native(map);
-+			if (!nvkm_device_endianness(map)) {
-+				nvdev_error(device,
-+					    "GPU not supported on big-endian\n");
-+				ret = -ENOSYS;
-+				goto done;
-+			}
- 		}
-
- 		/* read boot0 and strapping information */
--- 
-2.26.2
-
diff --git a/0001-device-detect-vGPUs.patch b/0001-device-detect-vGPUs.patch
deleted file mode 100644
index 08f591ff7..000000000
--- a/0001-device-detect-vGPUs.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Karol Herbst <kherbst@redhat.com>
-Date: Tue, 28 Apr 2020 18:54:04 +0200
-Subject: [PATCH] device: detect vGPUs
-
-Using ENODEV as this prevents probe failed errors in dmesg.
-
-v2: move check further down
-
-Signed-off-by: Karol Herbst <kherbst@redhat.com>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-index c732074bf790..f977dddcd809 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-@@ -2948,7 +2948,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- {
- 	struct nvkm_subdev *subdev;
- 	u64 mmio_base, mmio_size;
--	u32 boot0, strap;
-+	u32 boot0, boot1, strap;
- 	void __iomem *map = NULL;
- 	int ret = -EEXIST, i;
- 	unsigned chipset;
-@@ -2998,9 +2998,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- 			}
- 		}
-
--		/* read boot0 and strapping information */
- 		boot0 = ioread32_native(map + 0x000000);
--		strap = ioread32_native(map + 0x101000);
-
- 		/* chipset can be overridden for devel/testing purposes */
- 		chipset = nvkm_longopt(device->cfgopt, "NvChipset", 0);
-@@ -3158,6 +3156,17 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- 		nvdev_info(device, "NVIDIA %s (%08x)\n",
- 			   device->chip->name, boot0);
-
-+		/* vGPU detection */
-+		boot1 = ioread32_native(map + 0x000004);
-+		if (device->card_type >= TU100 && (boot1 & 0x00030000)) {
-+			nvdev_info(device, "vGPUs are not supported\n");
-+			ret = -ENODEV;
-+			goto done;
-+		}
-+
-+		/* read strapping information */
-+		strap = ioread32_native(map + 0x101000);
-+
- 		/* determine frequency of timing crystal */
- 		if ( device->card_type <= NV_10 || device->chipset < 0x17 ||
- 		    (device->chipset >= 0x20 && device->chipset < 0x25))
--- 
-2.26.2
-
diff --git a/0001-device-rework-mmio-mapping-code-to-get-rid-of-second.patch b/0001-device-rework-mmio-mapping-code-to-get-rid-of-second.patch
deleted file mode 100644
index bde820ba5..000000000
--- a/0001-device-rework-mmio-mapping-code-to-get-rid-of-second.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Karol Herbst <kherbst@redhat.com>
-Date: Tue, 28 Apr 2020 18:54:02 +0200
-Subject: [PATCH] device: rework mmio mapping code to get rid of second map
-
-Fixes warnings on GPUs with smaller a smaller mmio region like vGPUs.
-
-Signed-off-by: Karol Herbst <kherbst@redhat.com>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- .../gpu/drm/nouveau/nvkm/engine/device/base.c | 27 ++++++++++---------
- 1 file changed, 15 insertions(+), 12 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-index 8ebbe1656008..37589f36546d 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-@@ -2935,7 +2935,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- 	struct nvkm_subdev *subdev;
- 	u64 mmio_base, mmio_size;
- 	u32 boot0, strap;
--	void __iomem *map;
-+	void __iomem *map = NULL;
- 	int ret = -EEXIST, i;
- 	unsigned chipset;
-
-@@ -2961,12 +2961,17 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- 	mmio_base = device->func->resource_addr(device, 0);
- 	mmio_size = device->func->resource_size(device, 0);
-
--	/* identify the chipset, and determine classes of subdev/engines */
--	if (detect) {
--		map = ioremap(mmio_base, 0x102000);
--		if (ret = -ENOMEM, map == NULL)
-+	if (detect || mmio) {
-+		map = ioremap(mmio_base, mmio_size);
-+		if (map == NULL) {
-+			nvdev_error(device, "unable to map PRI\n");
-+			ret = -ENOMEM;
- 			goto done;
-+		}
-+	}
-
-+	/* identify the chipset, and determine classes of subdev/engines */
-+	if (detect) {
- 		/* switch mmio to cpu's native endianness */
- #ifndef __BIG_ENDIAN
- 		if (ioread32_native(map + 0x000004) != 0x00000000) {
-@@ -2980,7 +2985,6 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- 		/* read boot0 and strapping information */
- 		boot0 = ioread32_native(map + 0x000000);
- 		strap = ioread32_native(map + 0x101000);
--		iounmap(map);
-
- 		/* chipset can be overridden for devel/testing purposes */
- 		chipset = nvkm_longopt(device->cfgopt, "NvChipset", 0);
-@@ -3159,12 +3163,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- 		device->name = device->chip->name;
-
- 	if (mmio) {
--		device->pri = ioremap(mmio_base, mmio_size);
--		if (!device->pri) {
--			nvdev_error(device, "unable to map PRI\n");
--			ret = -ENOMEM;
--			goto done;
--		}
-+		device->pri = map;
- 	}
-
- 	mutex_init(&device->mutex);
-@@ -3254,6 +3253,10 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
-
- 	ret = 0;
- done:
-+	if (map && (!mmio || ret)) {
-+		device->pri = NULL;
-+		iounmap(map);
-+	}
- 	mutex_unlock(&nv_devices_mutex);
- 	return ret;
- }
--- 
-2.26.2
-
diff --git a/0001-device-use-regular-PRI-accessors-in-chipset-detectio.patch b/0001-device-use-regular-PRI-accessors-in-chipset-detectio.patch
deleted file mode 100644
index ec4345169..000000000
--- a/0001-device-use-regular-PRI-accessors-in-chipset-detectio.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ben Skeggs <bskeggs@redhat.com>
-Date: Thu, 30 Apr 2020 14:08:53 +1000
-Subject: [PATCH] device: use regular PRI accessors in chipset detection
-
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- .../gpu/drm/nouveau/nvkm/engine/device/base.c | 31 ++++++++-----------
- 1 file changed, 13 insertions(+), 18 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-index f977dddcd809..5b90c2a1bf3d 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
-@@ -2925,9 +2925,9 @@ nvkm_device_del(struct nvkm_device **pdevice)
- }
-
- static inline bool
--nvkm_device_endianness(void __iomem *pri)
-+nvkm_device_endianness(struct nvkm_device *device)
- {
--	u32 boot1 = ioread32_native(pri + 0x000004) & 0x01000001;
-+	u32 boot1 = nvkm_rd32(device, 0x000004) & 0x01000001;
- #ifdef __BIG_ENDIAN
- 	if (!boot1)
- 		return false;
-@@ -2949,7 +2949,6 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- 	struct nvkm_subdev *subdev;
- 	u64 mmio_base, mmio_size;
- 	u32 boot0, boot1, strap;
--	void __iomem *map = NULL;
- 	int ret = -EEXIST, i;
- 	unsigned chipset;
-
-@@ -2976,8 +2975,8 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- 	mmio_size = device->func->resource_size(device, 0);
-
- 	if (detect || mmio) {
--		map = ioremap(mmio_base, mmio_size);
--		if (map == NULL) {
-+		device->pri = ioremap(mmio_base, mmio_size);
-+		if (device->pri == NULL) {
- 			nvdev_error(device, "unable to map PRI\n");
- 			ret = -ENOMEM;
- 			goto done;
-@@ -2987,10 +2986,10 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- 	/* identify the chipset, and determine classes of subdev/engines */
- 	if (detect) {
- 		/* switch mmio to cpu's native endianness */
--		if (!nvkm_device_endianness(map)) {
--			iowrite32_native(0x01000001, map + 0x000004);
--			ioread32_native(map);
--			if (!nvkm_device_endianness(map)) {
-+		if (!nvkm_device_endianness(device)) {
-+			nvkm_wr32(device, 0x000004, 0x01000001);
-+			nvkm_rd32(device, 0x000000);
-+			if (!nvkm_device_endianness(device)) {
- 				nvdev_error(device,
- 					    "GPU not supported on big-endian\n");
- 				ret = -ENOSYS;
-@@ -2998,7 +2997,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- 			}
- 		}
-
--		boot0 = ioread32_native(map + 0x000000);
-+		boot0 = nvkm_rd32(device, 0x000000);
-
- 		/* chipset can be overridden for devel/testing purposes */
- 		chipset = nvkm_longopt(device->cfgopt, "NvChipset", 0);
-@@ -3157,7 +3156,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- 			   device->chip->name, boot0);
-
- 		/* vGPU detection */
--		boot1 = ioread32_native(map + 0x000004);
-+		boot1 = nvkm_rd32(device, 0x0000004);
- 		if (device->card_type >= TU100 && (boot1 & 0x00030000)) {
- 			nvdev_info(device, "vGPUs are not supported\n");
- 			ret = -ENODEV;
-@@ -3165,7 +3164,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- 		}
-
- 		/* read strapping information */
--		strap = ioread32_native(map + 0x101000);
-+		strap = nvkm_rd32(device, 0x101000);
-
- 		/* determine frequency of timing crystal */
- 		if ( device->card_type <= NV_10 || device->chipset < 0x17 ||
-@@ -3187,10 +3186,6 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
- 	if (!device->name)
- 		device->name = device->chip->name;
-
--	if (mmio) {
--		device->pri = map;
--	}
--
- 	mutex_init(&device->mutex);
-
- 	for (i = 0; i < NVKM_SUBDEV_NR; i++) {
-@@ -3278,9 +3273,9 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
-
- 	ret = 0;
- done:
--	if (map && (!mmio || ret)) {
-+	if (device->pri && (!mmio || ret)) {
-+		iounmap(device->pri);
- 		device->pri = NULL;
--		iounmap(map);
- 	}
- 	mutex_unlock(&nv_devices_mutex);
- 	return ret;
--- 
-2.26.2
-
diff --git a/0001-disp-gv100-expose-capabilities-class.patch b/0001-disp-gv100-expose-capabilities-class.patch
deleted file mode 100644
index 60293792f..000000000
--- a/0001-disp-gv100-expose-capabilities-class.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ben Skeggs <bskeggs@redhat.com>
-Date: Thu, 13 Feb 2020 09:39:34 +1000
-Subject: [PATCH] disp/gv100-: expose capabilities class
-
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/include/nvif/class.h  |  2 +
- .../gpu/drm/nouveau/nvkm/engine/disp/Kbuild   |  2 +
- .../drm/nouveau/nvkm/engine/disp/capsgv100.c  | 60 +++++++++++++++++++
- .../drm/nouveau/nvkm/engine/disp/rootgv100.c  |  1 +
- .../drm/nouveau/nvkm/engine/disp/rootnv50.h   |  3 +
- .../drm/nouveau/nvkm/engine/disp/roottu102.c  |  1 +
- 6 files changed, 69 insertions(+)
- create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/capsgv100.c
-
-diff --git a/drivers/gpu/drm/nouveau/include/nvif/class.h b/drivers/gpu/drm/nouveau/include/nvif/class.h
-index 30659747ffe8..2c79beb41126 100644
---- a/drivers/gpu/drm/nouveau/include/nvif/class.h
-+++ b/drivers/gpu/drm/nouveau/include/nvif/class.h
-@@ -89,6 +89,8 @@
- #define GV100_DISP                                    /* cl5070.h */ 0x0000c370
- #define TU102_DISP                                    /* cl5070.h */ 0x0000c570
-
-+#define GV100_DISP_CAPS                                              0x0000c373
-+
- #define NV31_MPEG                                                    0x00003174
- #define G82_MPEG                                                     0x00008274
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
-index 0d584d0da59c..f7af648e0c17 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
-@@ -74,6 +74,8 @@ nvkm-y += nvkm/engine/disp/rootgp102.o
- nvkm-y += nvkm/engine/disp/rootgv100.o
- nvkm-y += nvkm/engine/disp/roottu102.o
-
-+nvkm-y += nvkm/engine/disp/capsgv100.o
-+
- nvkm-y += nvkm/engine/disp/channv50.o
- nvkm-y += nvkm/engine/disp/changf119.o
- nvkm-y += nvkm/engine/disp/changv100.o
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/capsgv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/capsgv100.c
-new file mode 100644
-index 000000000000..5026e530f4bb
---- /dev/null
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/capsgv100.c
-@@ -0,0 +1,60 @@
-+/*
-+ * Copyright 2020 Red Hat Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ * OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+#define gv100_disp_caps(p) container_of((p), struct gv100_disp_caps, object)
-+#include "rootnv50.h"
-+
-+struct gv100_disp_caps {
-+	struct nvkm_object object;
-+	struct nv50_disp *disp;
-+};
-+
-+static int
-+gv100_disp_caps_map(struct nvkm_object *object, void *argv, u32 argc,
-+		    enum nvkm_object_map *type, u64 *addr, u64 *size)
-+{
-+	struct gv100_disp_caps *caps = gv100_disp_caps(object);
-+	struct nvkm_device *device = caps->disp->base.engine.subdev.device;
-+	*type = NVKM_OBJECT_MAP_IO;
-+	*addr = 0x640000 + device->func->resource_addr(device, 0);
-+	*size = 0x1000;
-+	return 0;
-+}
-+
-+static const struct nvkm_object_func
-+gv100_disp_caps = {
-+	.map = gv100_disp_caps_map,
-+};
-+
-+int
-+gv100_disp_caps_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,
-+		    struct nv50_disp *disp, struct nvkm_object **pobject)
-+{
-+	struct gv100_disp_caps *caps;
-+
-+	if (!(caps = kzalloc(sizeof(*caps), GFP_KERNEL)))
-+		return -ENOMEM;
-+	*pobject = &caps->object;
-+
-+	nvkm_object_ctor(&gv100_disp_caps, oclass, &caps->object);
-+	caps->disp = disp;
-+	return 0;
-+}
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgv100.c
-index 9c658d632d37..47efb48d769a 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgv100.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgv100.c
-@@ -27,6 +27,7 @@
- static const struct nv50_disp_root_func
- gv100_disp_root = {
- 	.user = {
-+		{{-1,-1,GV100_DISP_CAPS                }, gv100_disp_caps_new },
- 		{{0,0,GV100_DISP_CURSOR                }, gv100_disp_curs_new },
- 		{{0,0,GV100_DISP_WINDOW_IMM_CHANNEL_DMA}, gv100_disp_wimm_new },
- 		{{0,0,GV100_DISP_CORE_CHANNEL_DMA      }, gv100_disp_core_new },
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h
-index a1f942793f98..7070f5408d92 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h
-@@ -24,6 +24,9 @@ int  nv50_disp_root_new_(const struct nv50_disp_root_func *, struct nvkm_disp *,
- 			 const struct nvkm_oclass *, void *data, u32 size,
- 			 struct nvkm_object **);
-
-+int gv100_disp_caps_new(const struct nvkm_oclass *, void *, u32,
-+			struct nv50_disp *, struct nvkm_object **);
-+
- extern const struct nvkm_disp_oclass nv50_disp_root_oclass;
- extern const struct nvkm_disp_oclass g84_disp_root_oclass;
- extern const struct nvkm_disp_oclass g94_disp_root_oclass;
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/roottu102.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/roottu102.c
-index 579a5d02308a..d8719d38b98a 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/roottu102.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/roottu102.c
-@@ -27,6 +27,7 @@
- static const struct nv50_disp_root_func
- tu102_disp_root = {
- 	.user = {
-+		{{-1,-1,GV100_DISP_CAPS                }, gv100_disp_caps_new },
- 		{{0,0,TU102_DISP_CURSOR                }, gv100_disp_curs_new },
- 		{{0,0,TU102_DISP_WINDOW_IMM_CHANNEL_DMA}, gv100_disp_wimm_new },
- 		{{0,0,TU102_DISP_CORE_CHANNEL_DMA      }, gv100_disp_core_new },
--- 
-2.26.2
-
diff --git a/0001-disp-hda-gf119-add-HAL-for-programming-device-entry-.patch b/0001-disp-hda-gf119-add-HAL-for-programming-device-entry-.patch
deleted file mode 100644
index cba6699dc..000000000
--- a/0001-disp-hda-gf119-add-HAL-for-programming-device-entry-.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ben Skeggs <bskeggs@redhat.com>
-Date: Wed, 6 May 2020 14:40:56 +1000
-Subject: [PATCH] disp/hda/gf119-: add HAL for programming device entry in SF
-
-Register has moved on GV100.
-
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c | 11 +++++++++--
- drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h      |  2 ++
- drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c |  1 +
- drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c |  1 +
- drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c |  1 +
- drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c |  1 +
- drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgv100.c |  1 +
- drivers/gpu/drm/nouveau/nvkm/engine/disp/sortu102.c |  1 +
- 8 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
-index 1080ba6ecd64..8a0ec7db5145 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
-@@ -23,6 +23,14 @@
-  */
- #include "ior.h"
-
-+void
-+gf119_hda_device_entry(struct nvkm_ior *ior, int head)
-+{
-+	struct nvkm_device *device = ior->disp->engine.subdev.device;
-+	const u32 hoff = 0x800 * head;
-+	nvkm_mask(device, 0x616548 + hoff, 0x00000070, 0x00000000);
-+}
-+
- void
- gf119_hda_eld(struct nvkm_ior *ior, int head, u8 *data, u8 size)
- {
-@@ -41,11 +49,10 @@ void
- gf119_hda_hpd(struct nvkm_ior *ior, int head, bool present)
- {
- 	struct nvkm_device *device = ior->disp->engine.subdev.device;
--	const u32 hoff = 0x800 * head;
- 	u32 data = 0x80000000;
- 	u32 mask = 0x80000001;
- 	if (present) {
--		nvkm_mask(device, 0x616548 + hoff, 0x00000070, 0x00000000);
-+		ior->func->hda.device_entry(ior, head);
- 		data |= 0x00000001;
- 	} else {
- 		mask |= 0x00000002;
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
-index c60acf71831e..eb1155e47ecd 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
-@@ -88,6 +88,7 @@ struct nvkm_ior_func {
- 	struct {
- 		void (*hpd)(struct nvkm_ior *, int head, bool present);
- 		void (*eld)(struct nvkm_ior *, int head, u8 *data, u8 size);
-+		void (*device_entry)(struct nvkm_ior *, int head);
- 	} hda;
- };
-
-@@ -162,6 +163,7 @@ void gt215_hda_eld(struct nvkm_ior *, int, u8 *, u8);
-
- void gf119_hda_hpd(struct nvkm_ior *, int, bool);
- void gf119_hda_eld(struct nvkm_ior *, int, u8 *, u8);
-+void gf119_hda_device_entry(struct nvkm_ior *, int);
-
- #define IOR_MSG(i,l,f,a...) do {                                               \
- 	struct nvkm_ior *_ior = (i);                                           \
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
-index 456a5a143522..3b3643fb1019 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c
-@@ -177,6 +177,7 @@ gf119_sor = {
- 	.hda = {
- 		.hpd = gf119_hda_hpd,
- 		.eld = gf119_hda_eld,
-+		.device_entry = gf119_hda_device_entry,
- 	},
- };
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c
-index b94090edaebf..0c0925680790 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c
-@@ -43,6 +43,7 @@ gk104_sor = {
- 	.hda = {
- 		.hpd = gf119_hda_hpd,
- 		.eld = gf119_hda_eld,
-+		.device_entry = gf119_hda_device_entry,
- 	},
- };
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c
-index e6965dec09c9..38045c92197f 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c
-@@ -57,6 +57,7 @@ gm107_sor = {
- 	.hda = {
- 		.hpd = gf119_hda_hpd,
- 		.eld = gf119_hda_eld,
-+		.device_entry = gf119_hda_device_entry,
- 	},
- };
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
-index 384f82652bec..cf2075db742a 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c
-@@ -115,6 +115,7 @@ gm200_sor = {
- 	.hda = {
- 		.hpd = gf119_hda_hpd,
- 		.eld = gf119_hda_eld,
-+		.device_entry = gf119_hda_device_entry,
- 	},
- };
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgv100.c
-index b0597ff9a714..565cfbc65550 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgv100.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgv100.c
-@@ -103,6 +103,7 @@ gv100_sor = {
- 	.hda = {
- 		.hpd = gf119_hda_hpd,
- 		.eld = gf119_hda_eld,
-+		.device_entry = gf119_hda_device_entry,
- 	},
- };
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sortu102.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sortu102.c
-index 4d5f3791ea7b..b16ecea098c7 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sortu102.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sortu102.c
-@@ -88,6 +88,7 @@ tu102_sor = {
- 	.hda = {
- 		.hpd = gf119_hda_hpd,
- 		.eld = gf119_hda_eld,
-+		.device_entry = gf119_hda_device_entry,
- 	},
- };
-
--- 
-2.26.2
-
diff --git a/0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch b/0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch
deleted file mode 100644
index 714d1a0f3..000000000
--- a/0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ben Skeggs <bskeggs@redhat.com>
-Date: Wed, 6 May 2020 14:40:58 +1000
-Subject: [PATCH] disp/hda/gf119-: select HDA device entry based on bound head
-
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
-index 8a0ec7db5145..19d2d58344e4 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
-@@ -28,14 +28,14 @@ gf119_hda_device_entry(struct nvkm_ior *ior, int head)
- {
- 	struct nvkm_device *device = ior->disp->engine.subdev.device;
- 	const u32 hoff = 0x800 * head;
--	nvkm_mask(device, 0x616548 + hoff, 0x00000070, 0x00000000);
-+	nvkm_mask(device, 0x616548 + hoff, 0x00000070, head << 4);
- }
-
- void
- gf119_hda_eld(struct nvkm_ior *ior, int head, u8 *data, u8 size)
- {
- 	struct nvkm_device *device = ior->disp->engine.subdev.device;
--	const u32 soff = 0x030 * ior->id;
-+	const u32 soff = 0x030 * ior->id + (head * 0x04);
- 	int i;
-
- 	for (i = 0; i < size; i++)
-@@ -49,6 +49,7 @@ void
- gf119_hda_hpd(struct nvkm_ior *ior, int head, bool present)
- {
- 	struct nvkm_device *device = ior->disp->engine.subdev.device;
-+	const u32 soff = 0x030 * ior->id + (head * 0x04);
- 	u32 data = 0x80000000;
- 	u32 mask = 0x80000001;
- 	if (present) {
-@@ -57,5 +58,5 @@ gf119_hda_hpd(struct nvkm_ior *ior, int head, bool present)
- 	} else {
- 		mask |= 0x00000002;
- 	}
--	nvkm_mask(device, 0x10ec10 + ior->id * 0x030, mask, data);
-+	nvkm_mask(device, 0x10ec10 + soff, mask, data);
- }
--- 
-2.26.2
-
diff --git a/0001-disp-hda-gt215-pass-head-to-nvkm_ior.hda.eld.patch b/0001-disp-hda-gt215-pass-head-to-nvkm_ior.hda.eld.patch
deleted file mode 100644
index 0011e60ae..000000000
--- a/0001-disp-hda-gt215-pass-head-to-nvkm_ior.hda.eld.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ben Skeggs <bskeggs@redhat.com>
-Date: Wed, 6 May 2020 14:40:52 +1000
-Subject: [PATCH] disp/hda/gt215-: pass head to nvkm_ior.hda.eld()
-
-We're going to use the bound head to select HDA device entry.
-
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c | 2 +-
- drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c | 2 +-
- drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h      | 6 +++---
- drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
-index 0fa0ec0a1de0..1080ba6ecd64 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
-@@ -24,7 +24,7 @@
- #include "ior.h"
-
- void
--gf119_hda_eld(struct nvkm_ior *ior, u8 *data, u8 size)
-+gf119_hda_eld(struct nvkm_ior *ior, int head, u8 *data, u8 size)
- {
- 	struct nvkm_device *device = ior->disp->engine.subdev.device;
- 	const u32 soff = 0x030 * ior->id;
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
-index 4509d2ba880e..0d1b81fe1093 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
-@@ -24,7 +24,7 @@
- #include "ior.h"
-
- void
--gt215_hda_eld(struct nvkm_ior *ior, u8 *data, u8 size)
-+gt215_hda_eld(struct nvkm_ior *ior, int head, u8 *data, u8 size)
- {
- 	struct nvkm_device *device = ior->disp->engine.subdev.device;
- 	const u32 soff = ior->id * 0x800;
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
-index 009d3a8b7a50..c60acf71831e 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
-@@ -87,7 +87,7 @@ struct nvkm_ior_func {
-
- 	struct {
- 		void (*hpd)(struct nvkm_ior *, int head, bool present);
--		void (*eld)(struct nvkm_ior *, u8 *data, u8 size);
-+		void (*eld)(struct nvkm_ior *, int head, u8 *data, u8 size);
- 	} hda;
- };
-
-@@ -158,10 +158,10 @@ void gv100_hdmi_ctrl(struct nvkm_ior *, int, bool, u8, u8, u8 *, u8 , u8 *, u8);
- void gm200_hdmi_scdc(struct nvkm_ior *, int, u8);
-
- void gt215_hda_hpd(struct nvkm_ior *, int, bool);
--void gt215_hda_eld(struct nvkm_ior *, u8 *, u8);
-+void gt215_hda_eld(struct nvkm_ior *, int, u8 *, u8);
-
- void gf119_hda_hpd(struct nvkm_ior *, int, bool);
--void gf119_hda_eld(struct nvkm_ior *, u8 *, u8);
-+void gf119_hda_eld(struct nvkm_ior *, int, u8 *, u8);
-
- #define IOR_MSG(i,l,f,a...) do {                                               \
- 	struct nvkm_ior *_ior = (i);                                           \
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
-index 5f758948d6e1..a7672ef17d3b 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
-@@ -155,7 +155,7 @@ nv50_disp_root_mthd_(struct nvkm_object *object, u32 mthd, void *data, u32 size)
- 			if (outp->info.type == DCB_OUTPUT_DP)
- 				ior->func->dp.audio(ior, hidx, true);
- 			ior->func->hda.hpd(ior, hidx, true);
--			ior->func->hda.eld(ior, data, size);
-+			ior->func->hda.eld(ior, hidx, data, size);
- 		} else {
- 			if (outp->info.type == DCB_OUTPUT_DP)
- 				ior->func->dp.audio(ior, hidx, false);
--- 
-2.26.2
-
diff --git a/0001-disp-hda-gv100-NV_PDISP_SF_AUDIO_CNTRL0-register-mov.patch b/0001-disp-hda-gv100-NV_PDISP_SF_AUDIO_CNTRL0-register-mov.patch
deleted file mode 100644
index b93c9f13b..000000000
--- a/0001-disp-hda-gv100-NV_PDISP_SF_AUDIO_CNTRL0-register-mov.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ben Skeggs <bskeggs@redhat.com>
-Date: Wed, 6 May 2020 14:41:01 +1000
-Subject: [PATCH] disp/hda/gv100-: NV_PDISP_SF_AUDIO_CNTRL0 register moved
-
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- .../gpu/drm/nouveau/nvkm/engine/disp/Kbuild   |  1 +
- .../drm/nouveau/nvkm/engine/disp/hdagv100.c   | 30 +++++++++++++++++++
- .../gpu/drm/nouveau/nvkm/engine/disp/ior.h    |  2 ++
- .../drm/nouveau/nvkm/engine/disp/sorgv100.c   |  2 +-
- .../drm/nouveau/nvkm/engine/disp/sortu102.c   |  2 +-
- 5 files changed, 35 insertions(+), 2 deletions(-)
- create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagv100.c
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
-index f7af648e0c17..571687ba85b8 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild
-@@ -47,6 +47,7 @@ nvkm-y += nvkm/engine/disp/dp.o
-
- nvkm-y += nvkm/engine/disp/hdagt215.o
- nvkm-y += nvkm/engine/disp/hdagf119.o
-+nvkm-y += nvkm/engine/disp/hdagv100.o
-
- nvkm-y += nvkm/engine/disp/hdmi.o
- nvkm-y += nvkm/engine/disp/hdmig84.o
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagv100.c
-new file mode 100644
-index 000000000000..57d374ecfeef
---- /dev/null
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagv100.c
-@@ -0,0 +1,30 @@
-+/*
-+ * Copyright 2020 Red Hat Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ * OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+#include "ior.h"
-+
-+void
-+gv100_hda_device_entry(struct nvkm_ior *ior, int head)
-+{
-+	struct nvkm_device *device = ior->disp->engine.subdev.device;
-+	const u32 hoff = 0x800 * head;
-+	nvkm_mask(device, 0x616528 + hoff, 0x00000070, head << 4);
-+}
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
-index eb1155e47ecd..c1d7a36e4d3c 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h
-@@ -165,6 +165,8 @@ void gf119_hda_hpd(struct nvkm_ior *, int, bool);
- void gf119_hda_eld(struct nvkm_ior *, int, u8 *, u8);
- void gf119_hda_device_entry(struct nvkm_ior *, int);
-
-+void gv100_hda_device_entry(struct nvkm_ior *, int);
-+
- #define IOR_MSG(i,l,f,a...) do {                                               \
- 	struct nvkm_ior *_ior = (i);                                           \
- 	nvkm_##l(&_ior->disp->engine.subdev, "%s: "f"\n", _ior->name, ##a);    \
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgv100.c
-index 565cfbc65550..d11a0dff10c6 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgv100.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgv100.c
-@@ -103,7 +103,7 @@ gv100_sor = {
- 	.hda = {
- 		.hpd = gf119_hda_hpd,
- 		.eld = gf119_hda_eld,
--		.device_entry = gf119_hda_device_entry,
-+		.device_entry = gv100_hda_device_entry,
- 	},
- };
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sortu102.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sortu102.c
-index b16ecea098c7..fa6d74251237 100644
---- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sortu102.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sortu102.c
-@@ -88,7 +88,7 @@ tu102_sor = {
- 	.hda = {
- 		.hpd = gf119_hda_hpd,
- 		.eld = gf119_hda_eld,
--		.device_entry = gf119_hda_device_entry,
-+		.device_entry = gv100_hda_device_entry,
- 	},
- };
-
--- 
-2.26.2
-
diff --git a/0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch b/0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch
deleted file mode 100644
index d8c1a93d5..000000000
--- a/0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ben Skeggs <bskeggs@redhat.com>
-Date: Wed, 6 May 2020 14:40:45 +1000
-Subject: [PATCH] disp/nv50-: increase timeout on pio channel free() polling
-
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/curs507a.c b/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
-index 8c5cf096f69b..658a200ab616 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/curs507a.c
-@@ -32,7 +32,7 @@
- bool
- curs507a_space(struct nv50_wndw *wndw)
- {
--	nvif_msec(&nouveau_drm(wndw->plane.dev)->client.device, 2,
-+	nvif_msec(&nouveau_drm(wndw->plane.dev)->client.device, 100,
- 		if (nvif_rd32(&wndw->wimm.base.user, 0x0008) >= 4)
- 			return true;
- 	);
--- 
-2.26.2
-
diff --git a/0001-drm-Use-generic-helper-to-check-_PR3-presence.patch b/0001-drm-Use-generic-helper-to-check-_PR3-presence.patch
deleted file mode 100644
index f0f9e0dfd..000000000
--- a/0001-drm-Use-generic-helper-to-check-_PR3-presence.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Date: Thu, 23 Apr 2020 14:23:58 +0800
-Subject: [PATCH] drm: Use generic helper to check _PR3 presence
-
-Replace nouveau_pr3_present() in favor of a more generic one,
-pci_pr3_present().
-
-Also the presence of upstream bridge _PR3 doesn't need to go hand in
-hand with device's _DSM, so check _PR3 before _DSM.
-
-Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/nouveau_acpi.c | 44 ++++++--------------------
- 1 file changed, 10 insertions(+), 34 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
-index fe3a10255c36..b84dff1b0f28 100644
---- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
-@@ -212,37 +212,6 @@ static const struct vga_switcheroo_handler nouveau_dsm_handler = {
- 	.get_client_id = nouveau_dsm_get_client_id,
- };
-
--/*
-- * Firmware supporting Windows 8 or later do not use _DSM to put the device into
-- * D3cold, they instead rely on disabling power resources on the parent.
-- */
--static bool nouveau_pr3_present(struct pci_dev *pdev)
--{
--	struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);
--	struct acpi_device *parent_adev;
--
--	if (!parent_pdev)
--		return false;
--
--	if (!parent_pdev->bridge_d3) {
--		/*
--		 * Parent PCI bridge is currently not power managed.
--		 * Since userspace can change these afterwards to be on
--		 * the safe side we stick with _DSM and prevent usage of
--		 * _PR3 from the bridge.
--		 */
--		pci_d3cold_disable(pdev);
--		return false;
--	}
--
--	parent_adev = ACPI_COMPANION(&parent_pdev->dev);
--	if (!parent_adev)
--		return false;
--
--	return parent_adev->power.flags.power_resources &&
--		acpi_has_method(parent_adev->handle, "_PR3");
--}
--
- static void nouveau_dsm_pci_probe(struct pci_dev *pdev, acpi_handle *dhandle_out,
- 				  bool *has_mux, bool *has_opt,
- 				  bool *has_opt_flags, bool *has_pr3)
-@@ -250,6 +219,16 @@ static void nouveau_dsm_pci_probe(struct pci_dev *pdev, acpi_handle *dhandle_out
- 	acpi_handle dhandle;
- 	bool supports_mux;
- 	int optimus_funcs;
-+	struct pci_dev *parent_pdev;
-+
-+	*has_pr3 = false;
-+	parent_pdev = pci_upstream_bridge(pdev);
-+	if (parent_pdev) {
-+		if (parent_pdev->bridge_d3)
-+			*has_pr3 = pci_pr3_present(parent_pdev);
-+		else
-+			pci_d3cold_disable(pdev);
-+	}
-
- 	dhandle = ACPI_HANDLE(&pdev->dev);
- 	if (!dhandle)
-@@ -270,7 +249,6 @@ static void nouveau_dsm_pci_probe(struct pci_dev *pdev, acpi_handle *dhandle_out
- 	*has_mux = supports_mux;
- 	*has_opt = !!optimus_funcs;
- 	*has_opt_flags = optimus_funcs & (1 << NOUVEAU_DSM_OPTIMUS_FLAGS);
--	*has_pr3 = false;
-
- 	if (optimus_funcs) {
- 		uint32_t result;
-@@ -280,8 +258,6 @@ static void nouveau_dsm_pci_probe(struct pci_dev *pdev, acpi_handle *dhandle_out
- 			 (result & OPTIMUS_ENABLED) ? "enabled" : "disabled",
- 			 (result & OPTIMUS_DYNAMIC_PWR_CAP) ? "dynamic power, " : "",
- 			 (result & OPTIMUS_HDA_CODEC_MASK) ? "hda bios codec supported" : "");
--
--		*has_pr3 = nouveau_pr3_present(pdev);
- 	}
- }
-
--- 
-2.26.2
-
diff --git a/0001-drm-panel-add-Xingbangda-XBD599-panel.patch b/0001-drm-panel-add-Xingbangda-XBD599-panel.patch
index ae0850b8a..6866d5f69 100644
--- a/0001-drm-panel-add-Xingbangda-XBD599-panel.patch
+++ b/0001-drm-panel-add-Xingbangda-XBD599-panel.patch
@@ -17,12 +17,12 @@ Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
  create mode 100644 drivers/gpu/drm/panel/panel-xingbangda-xbd599.c
 
 diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
-index a1723c1b5fbf..cf0c59015a44 100644
+index 39055c1f0e2f..1f55a87bb657 100644
 --- a/drivers/gpu/drm/panel/Kconfig
 +++ b/drivers/gpu/drm/panel/Kconfig
-@@ -433,6 +433,15 @@ config DRM_PANEL_TRULY_NT35597_WQXGA
- 	  Say Y here if you want to enable support for Truly NT35597 WQXGA Dual DSI
- 	  Video Mode panel
+@@ -462,6 +462,15 @@ config DRM_PANEL_VISIONOX_RM69299
+ 	  Say Y here if you want to enable support for Visionox
+ 	  RM69299  DSI Video Mode panel.
 
 +config DRM_PANEL_XINGBANGDA_XBD599
 +	tristate "Xingbangda XBD599 panel"
@@ -37,13 +37,13 @@ index a1723c1b5fbf..cf0c59015a44 100644
  	tristate "Xinpeng XPP055C272 panel driver"
  	depends on OF
 diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
-index 96a883cd6630..c84ed5215984 100644
+index de74f282c433..7b6b0c0397d6 100644
 --- a/drivers/gpu/drm/panel/Makefile
 +++ b/drivers/gpu/drm/panel/Makefile
-@@ -46,4 +46,5 @@ obj-$(CONFIG_DRM_PANEL_TPO_TD028TTEC1) += panel-tpo-td028ttec1.o
- obj-$(CONFIG_DRM_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o
+@@ -49,4 +49,5 @@ obj-$(CONFIG_DRM_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o
  obj-$(CONFIG_DRM_PANEL_TPO_TPG110) += panel-tpo-tpg110.o
  obj-$(CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA) += panel-truly-nt35597.o
+ obj-$(CONFIG_DRM_PANEL_VISIONOX_RM69299) += panel-visionox-rm69299.o
 +obj-$(CONFIG_DRM_PANEL_XINGBANGDA_XBD599) += panel-xingbangda-xbd599.o
  obj-$(CONFIG_DRM_PANEL_XINPENG_XPP055C272) += panel-xinpeng-xpp055c272.o
 diff --git a/drivers/gpu/drm/panel/panel-xingbangda-xbd599.c b/drivers/gpu/drm/panel/panel-xingbangda-xbd599.c
diff --git a/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch b/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch
index f61b5490f..a812477f4 100644
--- a/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch
+++ b/0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch
@@ -13,10 +13,10 @@ Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
-index 3eb89f1eb0e1..4e415793d155 100644
+index aa67cb037e9d..52e009dc632b 100644
 --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
 +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
-@@ -555,7 +555,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
+@@ -556,7 +556,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
  		 */
  #define HSA_PACKET_OVERHEAD	10
  		hsa = max((unsigned int)HSA_PACKET_OVERHEAD,
@@ -25,7 +25,7 @@ index 3eb89f1eb0e1..4e415793d155 100644
 
  		/*
  		 * The backporch is set using a blanking packet (4
-@@ -564,7 +564,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
+@@ -565,7 +565,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
  		 */
  #define HBP_PACKET_OVERHEAD	6
  		hbp = max((unsigned int)HBP_PACKET_OVERHEAD,
@@ -34,7 +34,7 @@ index 3eb89f1eb0e1..4e415793d155 100644
 
  		/*
  		 * The frontporch is set using a sync event (4 bytes)
-@@ -574,7 +574,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
+@@ -575,7 +575,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
  		 */
  #define HFP_PACKET_OVERHEAD	16
  		hfp = max((unsigned int)HFP_PACKET_OVERHEAD,
@@ -43,7 +43,7 @@ index 3eb89f1eb0e1..4e415793d155 100644
 
  		/*
  		 * The blanking is set using a sync event (4 bytes)
-@@ -583,8 +583,8 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
+@@ -584,8 +584,8 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
  		 */
  #define HBLK_PACKET_OVERHEAD	10
  		hblk = max((unsigned int)HBLK_PACKET_OVERHEAD,
diff --git a/0001-kms-Fix-regression-by-audio-component-transition.patch b/0001-kms-Fix-regression-by-audio-component-transition.patch
deleted file mode 100644
index 198e0be9e..000000000
--- a/0001-kms-Fix-regression-by-audio-component-transition.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Thu, 16 Apr 2020 09:54:28 +0200
-Subject: [PATCH] kms: Fix regression by audio component transition
-
-Since the commit 742db30c4ee6 ("drm/nouveau: Add HD-audio component
-notifier support"), the nouveau driver notifies and pokes the HD-audio
-HPD and ELD via audio component, but this seems broken.  The culprit
-is the naive assumption that crtc->index corresponds to the HDA pin.
-Actually this rather corresponds to the MST dev_id (alias "pipe" in
-the audio component framework) while the actual port number is given
-from the output ior id number.
-
-This patch corrects the assignment of port and dev_id arguments in the
-audio component ops to recover from the HDMI/DP audio regression.
-
-Fixes: 742db30c4ee6 ("drm/nouveau: Add HD-audio component notifier support")
-BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=207223
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/dispnv50/disp.c | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
-index 6be9df1820c5..2625ed84fc44 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
-@@ -482,15 +482,16 @@ nv50_dac_create(struct drm_connector *connector, struct dcb_output *dcbe)
-  * audio component binding for ELD notification
-  */
- static void
--nv50_audio_component_eld_notify(struct drm_audio_component *acomp, int port)
-+nv50_audio_component_eld_notify(struct drm_audio_component *acomp, int port,
-+				int dev_id)
- {
- 	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
- 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,
--						 port, -1);
-+						 port, dev_id);
- }
-
- static int
--nv50_audio_component_get_eld(struct device *kdev, int port, int pipe,
-+nv50_audio_component_get_eld(struct device *kdev, int port, int dev_id,
- 			     bool *enabled, unsigned char *buf, int max_bytes)
- {
- 	struct drm_device *drm_dev = dev_get_drvdata(kdev);
-@@ -506,7 +507,8 @@ nv50_audio_component_get_eld(struct device *kdev, int port, int pipe,
- 		nv_encoder = nouveau_encoder(encoder);
- 		nv_connector = nouveau_encoder_connector_get(nv_encoder);
- 		nv_crtc = nouveau_crtc(encoder->crtc);
--		if (!nv_connector || !nv_crtc || nv_crtc->index != port)
-+		if (!nv_connector || !nv_crtc || nv_encoder->or != port ||
-+		    nv_crtc->index != dev_id)
- 			continue;
- 		*enabled = drm_detect_monitor_audio(nv_connector->edid);
- 		if (*enabled) {
-@@ -600,7 +602,8 @@ nv50_audio_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc)
-
- 	nvif_mthd(&disp->disp->object, 0, &args, sizeof(args));
-
--	nv50_audio_component_eld_notify(drm->audio.component, nv_crtc->index);
-+	nv50_audio_component_eld_notify(drm->audio.component, nv_encoder->or,
-+					nv_crtc->index);
- }
-
- static void
-@@ -634,7 +637,8 @@ nv50_audio_enable(struct drm_encoder *encoder, struct drm_display_mode *mode)
- 	nvif_mthd(&disp->disp->object, 0, &args,
- 		  sizeof(args.base) + drm_eld_size(args.data));
-
--	nv50_audio_component_eld_notify(drm->audio.component, nv_crtc->index);
-+	nv50_audio_component_eld_notify(drm->audio.component, nv_encoder->or,
-+					nv_crtc->index);
- }
-
- /******************************************************************************
--- 
-2.26.2
-
diff --git a/0001-kms-gv100-Add-support-for-interlaced-modes.patch b/0001-kms-gv100-Add-support-for-interlaced-modes.patch
deleted file mode 100644
index c50c826b8..000000000
--- a/0001-kms-gv100-Add-support-for-interlaced-modes.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lyude Paul <lyude@redhat.com>
-Date: Mon, 11 May 2020 18:41:25 -0400
-Subject: [PATCH] kms/gv100-: Add support for interlaced modes
-
-We advertise being able to set interlaced modes, so let's actually make
-sure to do that. Otherwise, we'll end up hanging the display engine due
-to trying to set a mode with timings adjusted for interlacing without
-telling the hardware it's actually an interlaced mode.
-
-Signed-off-by: Lyude Paul <lyude@redhat.com>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 5 +++--
- drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 5 +++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/headc37d.c b/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
-index 00011ce109a6..4a9a32b89f74 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
-@@ -168,14 +168,15 @@ headc37d_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
- 	struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;
- 	struct nv50_head_mode *m = &asyh->mode;
- 	u32 *push;
--	if ((push = evo_wait(core, 12))) {
-+	if ((push = evo_wait(core, 13))) {
- 		evo_mthd(push, 0x2064 + (head->base.index * 0x400), 5);
- 		evo_data(push, (m->v.active  << 16) | m->h.active );
- 		evo_data(push, (m->v.synce   << 16) | m->h.synce  );
- 		evo_data(push, (m->v.blanke  << 16) | m->h.blanke );
- 		evo_data(push, (m->v.blanks  << 16) | m->h.blanks );
- 		evo_data(push, (m->v.blank2e << 16) | m->v.blank2s);
--		evo_mthd(push, 0x200c + (head->base.index * 0x400), 1);
-+		evo_mthd(push, 0x2008 + (head->base.index * 0x400), 2);
-+		evo_data(push, m->interlace);
- 		evo_data(push, m->clock * 1000);
- 		evo_mthd(push, 0x2028 + (head->base.index * 0x400), 1);
- 		evo_data(push, m->clock * 1000);
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/headc57d.c b/drivers/gpu/drm/nouveau/dispnv50/headc57d.c
-index 938d910a1b1e..859131a8bc3c 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/headc57d.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/headc57d.c
-@@ -173,14 +173,15 @@ headc57d_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
- 	struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;
- 	struct nv50_head_mode *m = &asyh->mode;
- 	u32 *push;
--	if ((push = evo_wait(core, 12))) {
-+	if ((push = evo_wait(core, 13))) {
- 		evo_mthd(push, 0x2064 + (head->base.index * 0x400), 5);
- 		evo_data(push, (m->v.active  << 16) | m->h.active );
- 		evo_data(push, (m->v.synce   << 16) | m->h.synce  );
- 		evo_data(push, (m->v.blanke  << 16) | m->h.blanke );
- 		evo_data(push, (m->v.blanks  << 16) | m->h.blanks );
- 		evo_data(push, (m->v.blank2e << 16) | m->v.blank2s);
--		evo_mthd(push, 0x200c + (head->base.index * 0x400), 1);
-+		evo_mthd(push, 0x2008 + (head->base.index * 0x400), 2);
-+		evo_data(push, m->interlace);
- 		evo_data(push, m->clock * 1000);
- 		evo_mthd(push, 0x2028 + (head->base.index * 0x400), 1);
- 		evo_data(push, m->clock * 1000);
--- 
-2.26.2
-
diff --git a/0001-kms-nv50-Initialize-core-channel-in-nouveau_display_.patch b/0001-kms-nv50-Initialize-core-channel-in-nouveau_display_.patch
deleted file mode 100644
index b590bb06c..000000000
--- a/0001-kms-nv50-Initialize-core-channel-in-nouveau_display_.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lyude Paul <lyude@redhat.com>
-Date: Mon, 11 May 2020 18:41:23 -0400
-Subject: [PATCH] kms/nv50-: Initialize core channel in
- nouveau_display_create()
-
-We'll need the core channel initialized and ready by the time that we
-start creating modesetting objects, so that we can call the
-NV507D_GET_CAPABILITIES method to make the hardware expose it's
-modesetting capabilities for later probing.
-
-So, when loading the driver prepare the core channel from within
-nouveau_display_create(). Everywhere else, we initialize the core
-channel during resume.
-
-Signed-off-by: Lyude Paul <lyude@redhat.com>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/dispnv50/disp.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
-index 2625ed84fc44..2afd56b9887d 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
-@@ -2373,7 +2373,8 @@ nv50_display_init(struct drm_device *dev, bool resume, bool runtime)
- 	struct drm_encoder *encoder;
- 	struct drm_plane *plane;
-
--	core->func->init(core);
-+	if (resume || runtime)
-+		core->func->init(core);
-
- 	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
- 		if (encoder->encoder_type != DRM_MODE_ENCODER_DPMST) {
-@@ -2460,6 +2461,8 @@ nv50_display_create(struct drm_device *dev)
- 	if (ret)
- 		goto out;
-
-+	disp->core->func->init(disp->core);
-+
- 	/* create crtc objects to represent the hw heads */
- 	if (disp->disp->object.oclass >= GV100_DISP)
- 		crtcs = nvif_rd32(&device->object, 0x610060) & 0xff;
--- 
-2.26.2
-
diff --git a/0001-kms-nv50-Move-8BPC-limit-for-MST-into-nv50_mstc_get_.patch b/0001-kms-nv50-Move-8BPC-limit-for-MST-into-nv50_mstc_get_.patch
deleted file mode 100644
index 0a6a4cfa8..000000000
--- a/0001-kms-nv50-Move-8BPC-limit-for-MST-into-nv50_mstc_get_.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lyude Paul <lyude@redhat.com>
-Date: Mon, 11 May 2020 18:41:26 -0400
-Subject: [PATCH] kms/nv50-: Move 8BPC limit for MST into nv50_mstc_get_modes()
-
-This just limits the BPC for MST connectors to a maximum of 8 from
-nv50_mstc_get_modes(), instead of doing so during
-nv50_msto_atomic_check(). This doesn't introduce any functional changes
-yet (other then userspace now lying about the max bpc, but we can't
-support that yet anyway so meh). But, we'll need this in a moment so
-that we can share mode validation between SST and MST which will fix
-some real world issues.
-
-Signed-off-by: Lyude Paul <lyude@redhat.com>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/dispnv50/disp.c | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
-index 1db4f20b8697..e92e7bf49780 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
-@@ -908,15 +908,9 @@ nv50_msto_atomic_check(struct drm_encoder *encoder,
- 	if (!state->duplicated) {
- 		const int clock = crtc_state->adjusted_mode.clock;
-
--		/*
--		 * XXX: Since we don't use HDR in userspace quite yet, limit
--		 * the bpc to 8 to save bandwidth on the topology. In the
--		 * future, we'll want to properly fix this by dynamically
--		 * selecting the highest possible bpc that would fit in the
--		 * topology
--		 */
--		asyh->or.bpc = min(connector->display_info.bpc, 8U);
--		asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, asyh->or.bpc * 3, false);
-+		asyh->or.bpc = connector->display_info.bpc;
-+		asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, asyh->or.bpc * 3,
-+						    false);
- 	}
-
- 	slots = drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr, mstc->port,
-@@ -1076,8 +1070,17 @@ nv50_mstc_get_modes(struct drm_connector *connector)
- 	if (mstc->edid)
- 		ret = drm_add_edid_modes(&mstc->connector, mstc->edid);
-
--	if (!mstc->connector.display_info.bpc)
--		mstc->connector.display_info.bpc = 8;
-+	/*
-+	 * XXX: Since we don't use HDR in userspace quite yet, limit the bpc
-+	 * to 8 to save bandwidth on the topology. In the future, we'll want
-+	 * to properly fix this by dynamically selecting the highest possible
-+	 * bpc that would fit in the topology
-+	 */
-+	if (connector->display_info.bpc)
-+		connector->display_info.bpc =
-+			clamp(connector->display_info.bpc, 6U, 8U);
-+	else
-+		connector->display_info.bpc = 8;
-
- 	if (mstc->native)
- 		drm_mode_destroy(mstc->connector.dev, mstc->native);
--- 
-2.26.2
-
diff --git a/0001-kms-nv50-Probe-SOR-and-PIOR-caps-for-DP-interlacing-.patch b/0001-kms-nv50-Probe-SOR-and-PIOR-caps-for-DP-interlacing-.patch
deleted file mode 100644
index e74501bef..000000000
--- a/0001-kms-nv50-Probe-SOR-and-PIOR-caps-for-DP-interlacing-.patch
+++ /dev/null
@@ -1,439 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lyude Paul <lyude@redhat.com>
-Date: Mon, 11 May 2020 18:41:24 -0400
-Subject: [PATCH] kms/nv50-: Probe SOR and PIOR caps for DP interlacing support
-
-Right now, we make the mistake of allowing interlacing on all
-connectors. Nvidia hardware does not always support interlacing with DP
-though, so we need to make sure that we don't allow interlaced modes to
-be set in such situations as otherwise we'll end up accidentally hanging
-the display HW.
-
-This fixes some hangs with Turing, which would be caused by attempting
-to set an interlaced mode on hardware that doesn't support it. This
-patch likely fixes other hardware hanging in the same way as well.
-
-Note that we say we probe PIOR caps, but they don't actually have any
-interlacing caps. So, the get_caps() function for PIORs just sets
-interlacing support to true.
-
-Changes since v1:
-* Actually probe caps correctly this time, both on EVO and NVDisplay.
-Changes since v2:
-* Fix probing for < GF119
-* Use vfunc table, in prep for adding more caps in the future.
-
-Signed-off-by: Lyude Paul <lyude@redhat.com>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/dispnv50/core.h     |  7 ++++++
- drivers/gpu/drm/nouveau/dispnv50/core507d.c | 15 ++++++++++++
- drivers/gpu/drm/nouveau/dispnv50/core827d.c |  1 +
- drivers/gpu/drm/nouveau/dispnv50/core907d.c |  1 +
- drivers/gpu/drm/nouveau/dispnv50/core917d.c |  1 +
- drivers/gpu/drm/nouveau/dispnv50/corec37d.c | 26 +++++++++++++++++++++
- drivers/gpu/drm/nouveau/dispnv50/corec57d.c |  1 +
- drivers/gpu/drm/nouveau/dispnv50/disp.c     | 19 +++++++++++++--
- drivers/gpu/drm/nouveau/dispnv50/disp.h     |  1 +
- drivers/gpu/drm/nouveau/dispnv50/pior507d.c |  8 +++++++
- drivers/gpu/drm/nouveau/dispnv50/sor507d.c  |  7 ++++++
- drivers/gpu/drm/nouveau/dispnv50/sor907d.c  | 11 +++++++++
- drivers/gpu/drm/nouveau/dispnv50/sorc37d.c  |  9 +++++++
- drivers/gpu/drm/nouveau/nouveau_connector.c | 10 +++++++-
- drivers/gpu/drm/nouveau/nouveau_encoder.h   |  4 ++++
- 15 files changed, 118 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/core.h b/drivers/gpu/drm/nouveau/dispnv50/core.h
-index ff94f3f6f264..99157dc94d23 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/core.h
-+++ b/drivers/gpu/drm/nouveau/dispnv50/core.h
-@@ -2,6 +2,7 @@
- #define __NV50_KMS_CORE_H__
- #include "disp.h"
- #include "atom.h"
-+#include <nouveau_encoder.h>
-
- struct nv50_core {
- 	const struct nv50_core_func *func;
-@@ -15,6 +16,7 @@ void nv50_core_del(struct nv50_core **);
- struct nv50_core_func {
- 	void (*init)(struct nv50_core *);
- 	void (*ntfy_init)(struct nouveau_bo *, u32 offset);
-+	int (*caps_init)(struct nouveau_drm *, struct nv50_disp *);
- 	int (*ntfy_wait_done)(struct nouveau_bo *, u32 offset,
- 			      struct nvif_device *);
- 	void (*update)(struct nv50_core *, u32 *interlock, bool ntfy);
-@@ -27,6 +29,9 @@ struct nv50_core_func {
- 	const struct nv50_outp_func {
- 		void (*ctrl)(struct nv50_core *, int or, u32 ctrl,
- 			     struct nv50_head_atom *);
-+		/* XXX: Only used by SORs and PIORs for now */
-+		void (*get_caps)(struct nv50_disp *,
-+				 struct nouveau_encoder *, int or);
- 	} *dac, *pior, *sor;
- };
-
-@@ -35,6 +40,7 @@ int core507d_new_(const struct nv50_core_func *, struct nouveau_drm *, s32,
- 		  struct nv50_core **);
- void core507d_init(struct nv50_core *);
- void core507d_ntfy_init(struct nouveau_bo *, u32);
-+int core507d_caps_init(struct nouveau_drm *, struct nv50_disp *);
- int core507d_ntfy_wait_done(struct nouveau_bo *, u32, struct nvif_device *);
- void core507d_update(struct nv50_core *, u32 *, bool);
-
-@@ -51,6 +57,7 @@ extern const struct nv50_outp_func sor907d;
- int core917d_new(struct nouveau_drm *, s32, struct nv50_core **);
-
- int corec37d_new(struct nouveau_drm *, s32, struct nv50_core **);
-+int corec37d_caps_init(struct nouveau_drm *, struct nv50_disp *);
- int corec37d_ntfy_wait_done(struct nouveau_bo *, u32, struct nvif_device *);
- void corec37d_update(struct nv50_core *, u32 *, bool);
- void corec37d_wndw_owner(struct nv50_core *);
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/core507d.c b/drivers/gpu/drm/nouveau/dispnv50/core507d.c
-index c5152c39c684..e341f572c269 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/core507d.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/core507d.c
-@@ -62,6 +62,20 @@ core507d_ntfy_init(struct nouveau_bo *bo, u32 offset)
- 	nouveau_bo_wr32(bo, offset / 4, 0x00000000);
- }
-
-+int
-+core507d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp)
-+{
-+	u32 *push = evo_wait(&disp->core->chan, 2);
-+
-+	if (push) {
-+		evo_mthd(push, 0x008c, 1);
-+		evo_data(push, 0x0);
-+		evo_kick(push, &disp->core->chan);
-+	}
-+
-+	return 0;
-+}
-+
- void
- core507d_init(struct nv50_core *core)
- {
-@@ -77,6 +91,7 @@ static const struct nv50_core_func
- core507d = {
- 	.init = core507d_init,
- 	.ntfy_init = core507d_ntfy_init,
-+	.caps_init = core507d_caps_init,
- 	.ntfy_wait_done = core507d_ntfy_wait_done,
- 	.update = core507d_update,
- 	.head = &head507d,
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/core827d.c b/drivers/gpu/drm/nouveau/dispnv50/core827d.c
-index 6123a068f836..2e0c1c536afe 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/core827d.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/core827d.c
-@@ -26,6 +26,7 @@ static const struct nv50_core_func
- core827d = {
- 	.init = core507d_init,
- 	.ntfy_init = core507d_ntfy_init,
-+	.caps_init = core507d_caps_init,
- 	.ntfy_wait_done = core507d_ntfy_wait_done,
- 	.update = core507d_update,
- 	.head = &head827d,
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/core907d.c b/drivers/gpu/drm/nouveau/dispnv50/core907d.c
-index ef822f813435..271629832629 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/core907d.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/core907d.c
-@@ -26,6 +26,7 @@ static const struct nv50_core_func
- core907d = {
- 	.init = core507d_init,
- 	.ntfy_init = core507d_ntfy_init,
-+	.caps_init = core507d_caps_init,
- 	.ntfy_wait_done = core507d_ntfy_wait_done,
- 	.update = core507d_update,
- 	.head = &head907d,
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/core917d.c b/drivers/gpu/drm/nouveau/dispnv50/core917d.c
-index 392338df5bfd..5cc072d4c30f 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/core917d.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/core917d.c
-@@ -26,6 +26,7 @@ static const struct nv50_core_func
- core917d = {
- 	.init = core507d_init,
- 	.ntfy_init = core507d_ntfy_init,
-+	.caps_init = core507d_caps_init,
- 	.ntfy_wait_done = core507d_ntfy_wait_done,
- 	.update = core507d_update,
- 	.head = &head917d,
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/corec37d.c b/drivers/gpu/drm/nouveau/dispnv50/corec37d.c
-index c03cb987856b..e0c8811fb8e4 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/corec37d.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/corec37d.c
-@@ -22,6 +22,7 @@
- #include "core.h"
- #include "head.h"
-
-+#include <nvif/class.h>
- #include <nouveau_bo.h>
-
- #include <nvif/timer.h>
-@@ -87,6 +88,30 @@ corec37d_ntfy_init(struct nouveau_bo *bo, u32 offset)
- 	nouveau_bo_wr32(bo, offset / 4 + 3, 0x00000000);
- }
-
-+int corec37d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp)
-+{
-+	int ret;
-+
-+	ret = nvif_object_init(&disp->disp->object, 0, GV100_DISP_CAPS,
-+			       NULL, 0, &disp->caps);
-+	if (ret) {
-+		NV_ERROR(drm,
-+			 "Failed to init notifier caps region: %d\n",
-+			 ret);
-+		return ret;
-+	}
-+
-+	ret = nvif_object_map(&disp->caps, NULL, 0);
-+	if (ret) {
-+		NV_ERROR(drm,
-+			 "Failed to map notifier caps region: %d\n",
-+			 ret);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
- static void
- corec37d_init(struct nv50_core *core)
- {
-@@ -111,6 +136,7 @@ static const struct nv50_core_func
- corec37d = {
- 	.init = corec37d_init,
- 	.ntfy_init = corec37d_ntfy_init,
-+	.caps_init = corec37d_caps_init,
- 	.ntfy_wait_done = corec37d_ntfy_wait_done,
- 	.update = corec37d_update,
- 	.wndw.owner = corec37d_wndw_owner,
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/corec57d.c b/drivers/gpu/drm/nouveau/dispnv50/corec57d.c
-index 147adcd60937..10ba9e9e4ae6 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/corec57d.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/corec57d.c
-@@ -46,6 +46,7 @@ static const struct nv50_core_func
- corec57d = {
- 	.init = corec57d_init,
- 	.ntfy_init = corec37d_ntfy_init,
-+	.caps_init = corec37d_caps_init,
- 	.ntfy_wait_done = corec37d_ntfy_wait_done,
- 	.update = corec37d_update,
- 	.wndw.owner = corec37d_wndw_owner,
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
-index 2afd56b9887d..1db4f20b8697 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
-@@ -1663,6 +1663,7 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe)
- 	struct nvkm_i2c *i2c = nvxx_i2c(&drm->client.device);
- 	struct nouveau_encoder *nv_encoder;
- 	struct drm_encoder *encoder;
-+	struct nv50_disp *disp = nv50_disp(connector->dev);
- 	int type, ret;
-
- 	switch (dcbe->type) {
-@@ -1689,10 +1690,12 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe)
-
- 	drm_connector_attach_encoder(connector, encoder);
-
-+	disp->core->func->sor->get_caps(disp, nv_encoder, ffs(dcbe->or) - 1);
-+
- 	if (dcbe->type == DCB_OUTPUT_DP) {
--		struct nv50_disp *disp = nv50_disp(encoder->dev);
- 		struct nvkm_i2c_aux *aux =
- 			nvkm_i2c_aux_find(i2c, dcbe->i2c_index);
-+
- 		if (aux) {
- 			if (disp->disp->object.oclass < GF110_DISP) {
- 				/* HW has no support for address-only
-@@ -1805,7 +1808,9 @@ nv50_pior_func = {
- static int
- nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe)
- {
--	struct nouveau_drm *drm = nouveau_drm(connector->dev);
-+	struct drm_device *dev = connector->dev;
-+	struct nouveau_drm *drm = nouveau_drm(dev);
-+	struct nv50_disp *disp = nv50_disp(dev);
- 	struct nvkm_i2c *i2c = nvxx_i2c(&drm->client.device);
- 	struct nvkm_i2c_bus *bus = NULL;
- 	struct nvkm_i2c_aux *aux = NULL;
-@@ -1844,6 +1849,9 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe)
- 	drm_encoder_helper_add(encoder, &nv50_pior_help);
-
- 	drm_connector_attach_encoder(connector, encoder);
-+
-+	disp->core->func->pior->get_caps(disp, nv_encoder, ffs(dcbe->or) - 1);
-+
- 	return 0;
- }
-
-@@ -2401,6 +2409,8 @@ nv50_display_destroy(struct drm_device *dev)
-
- 	nv50_audio_component_fini(nouveau_drm(dev));
-
-+	nvif_object_unmap(&disp->caps);
-+	nvif_object_fini(&disp->caps);
- 	nv50_core_del(&disp->core);
-
- 	nouveau_bo_unmap(disp->sync);
-@@ -2462,6 +2472,11 @@ nv50_display_create(struct drm_device *dev)
- 		goto out;
-
- 	disp->core->func->init(disp->core);
-+	if (disp->core->func->caps_init) {
-+		ret = disp->core->func->caps_init(drm, disp);
-+		if (ret)
-+			goto out;
-+	}
-
- 	/* create crtc objects to represent the hw heads */
- 	if (disp->disp->object.oclass >= GV100_DISP)
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.h b/drivers/gpu/drm/nouveau/dispnv50/disp.h
-index d54fe00ac3a3..89c3b38c32a5 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/disp.h
-+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.h
-@@ -9,6 +9,7 @@ struct nv50_msto;
- struct nv50_disp {
- 	struct nvif_disp *disp;
- 	struct nv50_core *core;
-+	struct nvif_object caps;
-
- #define NV50_DISP_SYNC(c, o)                                ((c) * 0x040 + (o))
- #define NV50_DISP_CORE_NTFY                       NV50_DISP_SYNC(0      , 0x00)
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/pior507d.c b/drivers/gpu/drm/nouveau/dispnv50/pior507d.c
-index d2bac6a341dc..45d8ce7d2c28 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/pior507d.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/pior507d.c
-@@ -38,7 +38,15 @@ pior507d_ctrl(struct nv50_core *core, int or, u32 ctrl,
- 	}
- }
-
-+static void
-+pior507d_get_caps(struct nv50_disp *disp, struct nouveau_encoder *outp,
-+		  int or)
-+{
-+	outp->caps.dp_interlace = true;
-+}
-+
- const struct nv50_outp_func
- pior507d = {
- 	.ctrl = pior507d_ctrl,
-+	.get_caps = pior507d_get_caps,
- };
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/sor507d.c b/drivers/gpu/drm/nouveau/dispnv50/sor507d.c
-index 5222fe6a9b21..9a59fa7da00d 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/sor507d.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/sor507d.c
-@@ -38,7 +38,14 @@ sor507d_ctrl(struct nv50_core *core, int or, u32 ctrl,
- 	}
- }
-
-+static void
-+sor507d_get_caps(struct nv50_disp *core, struct nouveau_encoder *outp, int or)
-+{
-+	outp->caps.dp_interlace = true;
-+}
-+
- const struct nv50_outp_func
- sor507d = {
- 	.ctrl = sor507d_ctrl,
-+	.get_caps = sor507d_get_caps,
- };
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/sor907d.c b/drivers/gpu/drm/nouveau/dispnv50/sor907d.c
-index b0314ec11fb3..9577ccf1c809 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/sor907d.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/sor907d.c
-@@ -21,6 +21,7 @@
-  */
- #include "core.h"
-
-+#include <nouveau_bo.h>
- #include <nvif/class.h>
-
- static void
-@@ -35,7 +36,17 @@ sor907d_ctrl(struct nv50_core *core, int or, u32 ctrl,
- 	}
- }
-
-+static void
-+sor907d_get_caps(struct nv50_disp *disp, struct nouveau_encoder *outp, int or)
-+{
-+	const int off = or * 2;
-+	u32 tmp = nouveau_bo_rd32(disp->sync, 0x000014 + off);
-+
-+	outp->caps.dp_interlace = !!(tmp & 0x04000000);
-+}
-+
- const struct nv50_outp_func
- sor907d = {
- 	.ctrl = sor907d_ctrl,
-+	.get_caps = sor907d_get_caps,
- };
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/sorc37d.c b/drivers/gpu/drm/nouveau/dispnv50/sorc37d.c
-index dff059241c5d..c86ca955fdcd 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/sorc37d.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/sorc37d.c
-@@ -33,7 +33,16 @@ sorc37d_ctrl(struct nv50_core *core, int or, u32 ctrl,
- 	}
- }
-
-+static void
-+sorc37d_get_caps(struct nv50_disp *disp, struct nouveau_encoder *outp, int or)
-+{
-+	u32 tmp = nvif_rd32(&disp->caps, 0x000144 + (or * 8));
-+
-+	outp->caps.dp_interlace = !!(tmp & 0x04000000);
-+}
-+
- const struct nv50_outp_func
- sorc37d = {
- 	.ctrl = sorc37d_ctrl,
-+	.get_caps = sorc37d_get_caps,
- };
-diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
-index 9a9a7f5003d3..6dae00da5d7e 100644
---- a/drivers/gpu/drm/nouveau/nouveau_connector.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
-@@ -509,7 +509,11 @@ nouveau_connector_set_encoder(struct drm_connector *connector,
- 	nv_connector->detected_encoder = nv_encoder;
-
- 	if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
--		connector->interlace_allowed = true;
-+		if (nv_encoder->dcb->type == DCB_OUTPUT_DP)
-+			connector->interlace_allowed =
-+				nv_encoder->caps.dp_interlace;
-+		else
-+			connector->interlace_allowed = true;
- 		connector->doublescan_allowed = true;
- 	} else
- 	if (nv_encoder->dcb->type == DCB_OUTPUT_LVDS ||
-@@ -1060,6 +1064,10 @@ nouveau_connector_mode_valid(struct drm_connector *connector,
- 	case DCB_OUTPUT_TV:
- 		return get_slave_funcs(encoder)->mode_valid(encoder, mode);
- 	case DCB_OUTPUT_DP:
-+		if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
-+		    !nv_encoder->caps.dp_interlace)
-+			return MODE_NO_INTERLACE;
-+
- 		max_clock  = nv_encoder->dp.link_nr;
- 		max_clock *= nv_encoder->dp.link_bw;
- 		clock = clock * (connector->display_info.bpc * 3) / 10;
-diff --git a/drivers/gpu/drm/nouveau/nouveau_encoder.h b/drivers/gpu/drm/nouveau/nouveau_encoder.h
-index 3517f920bf89..3217f587eceb 100644
---- a/drivers/gpu/drm/nouveau/nouveau_encoder.h
-+++ b/drivers/gpu/drm/nouveau/nouveau_encoder.h
-@@ -66,6 +66,10 @@ struct nouveau_encoder {
- 		} dp;
- 	};
-
-+	struct {
-+		bool dp_interlace : 1;
-+	} caps;
-+
- 	void (*enc_save)(struct drm_encoder *encoder);
- 	void (*enc_restore)(struct drm_encoder *encoder);
- 	void (*update)(struct nouveau_encoder *, u8 head,
--- 
-2.26.2
-
diff --git a/0001-kms-nv50-Share-DP-SST-mode_valid-handling-with-MST.patch b/0001-kms-nv50-Share-DP-SST-mode_valid-handling-with-MST.patch
deleted file mode 100644
index c14aed7ea..000000000
--- a/0001-kms-nv50-Share-DP-SST-mode_valid-handling-with-MST.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lyude Paul <lyude@redhat.com>
-Date: Mon, 11 May 2020 18:41:27 -0400
-Subject: [PATCH] kms/nv50-: Share DP SST mode_valid() handling with MST
-
-Currently, the nv50_mstc_mode_valid() function is happy to take any and
-all modes, even the ones we can't actually support sometimes like
-interlaced modes.
-
-Luckily, the only difference between the mode validation that needs to
-be performed for MST vs. SST is that eventually we'll need to check the
-minimum PBN against the MSTB's full PBN capabilities (remember-we don't
-care about the current bw state here). Otherwise, all of the other code
-can be shared.
-
-So, we move all of the common mode validation in
-nouveau_connector_mode_valid() into a separate helper,
-nv50_dp_mode_valid(), and use that from both nv50_mstc_mode_valid() and
-nouveau_connector_mode_valid(). Note that we allow for returning the
-calculated clock that nv50_dp_mode_valid() came up with, since we'll
-eventually want to use that for PBN calculation in
-nv50_mstc_mode_valid().
-
-Signed-off-by: Lyude Paul <lyude@redhat.com>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/dispnv50/disp.c     |  9 +++-
- drivers/gpu/drm/nouveau/nouveau_connector.c | 46 ++++++++++++---------
- drivers/gpu/drm/nouveau/nouveau_connector.h |  5 +++
- drivers/gpu/drm/nouveau/nouveau_dp.c        | 31 ++++++++++++++
- drivers/gpu/drm/nouveau/nouveau_encoder.h   |  4 ++
- 5 files changed, 75 insertions(+), 20 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
-index e92e7bf49780..d5d69532f3c5 100644
---- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
-+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
-@@ -1056,7 +1056,14 @@ static enum drm_mode_status
- nv50_mstc_mode_valid(struct drm_connector *connector,
- 		     struct drm_display_mode *mode)
- {
--	return MODE_OK;
-+	struct nv50_mstc *mstc = nv50_mstc(connector);
-+	struct nouveau_encoder *outp = mstc->mstm->outp;
-+
-+	/* TODO: calculate the PBN from the dotclock and validate against the
-+	 * MSTB's max possible PBN
-+	 */
-+
-+	return nv50_dp_mode_valid(connector, outp, mode, NULL);
- }
-
- static int
-diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
-index 6dae00da5d7e..1b383ae0248f 100644
---- a/drivers/gpu/drm/nouveau/nouveau_connector.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
-@@ -38,6 +38,7 @@
- #include "nouveau_reg.h"
- #include "nouveau_drv.h"
- #include "dispnv04/hw.h"
-+#include "dispnv50/disp.h"
- #include "nouveau_acpi.h"
-
- #include "nouveau_display.h"
-@@ -1033,6 +1034,29 @@ get_tmds_link_bandwidth(struct drm_connector *connector)
- 		return 112000 * duallink_scale;
- }
-
-+enum drm_mode_status
-+nouveau_conn_mode_clock_valid(const struct drm_display_mode *mode,
-+			      const unsigned min_clock,
-+			      const unsigned max_clock,
-+			      unsigned int *clock_out)
-+{
-+	unsigned int clock = mode->clock;
-+
-+	if ((mode->flags & DRM_MODE_FLAG_3D_MASK) ==
-+	    DRM_MODE_FLAG_3D_FRAME_PACKING)
-+		clock *= 2;
-+
-+	if (clock < min_clock)
-+		return MODE_CLOCK_LOW;
-+	if (clock > max_clock)
-+		return MODE_CLOCK_HIGH;
-+
-+	if (clock_out)
-+		*clock_out = clock;
-+
-+	return MODE_OK;
-+}
-+
- static enum drm_mode_status
- nouveau_connector_mode_valid(struct drm_connector *connector,
- 			     struct drm_display_mode *mode)
-@@ -1041,7 +1065,6 @@ nouveau_connector_mode_valid(struct drm_connector *connector,
- 	struct nouveau_encoder *nv_encoder = nv_connector->detected_encoder;
- 	struct drm_encoder *encoder = to_drm_encoder(nv_encoder);
- 	unsigned min_clock = 25000, max_clock = min_clock;
--	unsigned clock = mode->clock;
-
- 	switch (nv_encoder->dcb->type) {
- 	case DCB_OUTPUT_LVDS:
-@@ -1064,29 +1087,14 @@ nouveau_connector_mode_valid(struct drm_connector *connector,
- 	case DCB_OUTPUT_TV:
- 		return get_slave_funcs(encoder)->mode_valid(encoder, mode);
- 	case DCB_OUTPUT_DP:
--		if (mode->flags & DRM_MODE_FLAG_INTERLACE &&
--		    !nv_encoder->caps.dp_interlace)
--			return MODE_NO_INTERLACE;
--
--		max_clock  = nv_encoder->dp.link_nr;
--		max_clock *= nv_encoder->dp.link_bw;
--		clock = clock * (connector->display_info.bpc * 3) / 10;
--		break;
-+		return nv50_dp_mode_valid(connector, nv_encoder, mode, NULL);
- 	default:
- 		BUG();
- 		return MODE_BAD;
- 	}
-
--	if ((mode->flags & DRM_MODE_FLAG_3D_MASK) == DRM_MODE_FLAG_3D_FRAME_PACKING)
--		clock *= 2;
--
--	if (clock < min_clock)
--		return MODE_CLOCK_LOW;
--
--	if (clock > max_clock)
--		return MODE_CLOCK_HIGH;
--
--	return MODE_OK;
-+	return nouveau_conn_mode_clock_valid(mode, min_clock, max_clock,
-+					     NULL);
- }
-
- static struct drm_encoder *
-diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h
-index de84fb4708c7..9e062c7adec8 100644
---- a/drivers/gpu/drm/nouveau/nouveau_connector.h
-+++ b/drivers/gpu/drm/nouveau/nouveau_connector.h
-@@ -195,6 +195,11 @@ int nouveau_conn_atomic_get_property(struct drm_connector *,
- 				     const struct drm_connector_state *,
- 				     struct drm_property *, u64 *);
- struct drm_display_mode *nouveau_conn_native_mode(struct drm_connector *);
-+enum drm_mode_status
-+nouveau_conn_mode_clock_valid(const struct drm_display_mode *,
-+			      const unsigned min_clock,
-+			      const unsigned max_clock,
-+			      unsigned *clock);
-
- #ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT
- extern int nouveau_backlight_init(struct drm_connector *);
-diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c
-index 2674f1587457..8a0f7994e1ae 100644
---- a/drivers/gpu/drm/nouveau/nouveau_dp.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_dp.c
-@@ -98,3 +98,34 @@ nouveau_dp_detect(struct nouveau_encoder *nv_encoder)
- 		return NOUVEAU_DP_SST;
- 	return ret;
- }
-+
-+/* TODO:
-+ * - Use the minimum possible BPC here, once we add support for the max bpc
-+ *   property.
-+ * - Validate the mode against downstream port caps (see
-+ *   drm_dp_downstream_max_clock())
-+ * - Validate against the DP caps advertised by the GPU (we don't check these
-+ *   yet)
-+ */
-+enum drm_mode_status
-+nv50_dp_mode_valid(struct drm_connector *connector,
-+		   struct nouveau_encoder *outp,
-+		   const struct drm_display_mode *mode,
-+		   unsigned *out_clock)
-+{
-+	const unsigned min_clock = 25000;
-+	unsigned max_clock, clock;
-+	enum drm_mode_status ret;
-+
-+	if (mode->flags & DRM_MODE_FLAG_INTERLACE && !outp->caps.dp_interlace)
-+		return MODE_NO_INTERLACE;
-+
-+	max_clock = outp->dp.link_nr * outp->dp.link_bw;
-+	clock = mode->clock * (connector->display_info.bpc * 3) / 10;
-+
-+	ret = nouveau_conn_mode_clock_valid(mode, min_clock, max_clock,
-+					    &clock);
-+	if (out_clock)
-+		*out_clock = clock;
-+	return ret;
-+}
-diff --git a/drivers/gpu/drm/nouveau/nouveau_encoder.h b/drivers/gpu/drm/nouveau/nouveau_encoder.h
-index 3217f587eceb..de51733b0476 100644
---- a/drivers/gpu/drm/nouveau/nouveau_encoder.h
-+++ b/drivers/gpu/drm/nouveau/nouveau_encoder.h
-@@ -104,6 +104,10 @@ enum nouveau_dp_status {
- };
-
- int nouveau_dp_detect(struct nouveau_encoder *);
-+enum drm_mode_status nv50_dp_mode_valid(struct drm_connector *,
-+					struct nouveau_encoder *,
-+					const struct drm_display_mode *,
-+					unsigned *clock);
-
- struct nouveau_connector *
- nouveau_encoder_connector_get(struct nouveau_encoder *encoder);
--- 
-2.26.2
-
diff --git a/0001-mmu-Remove-unneeded-semicolon.patch b/0001-mmu-Remove-unneeded-semicolon.patch
deleted file mode 100644
index 3931ff586..000000000
--- a/0001-mmu-Remove-unneeded-semicolon.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zheng Bin <zhengbin13@huawei.com>
-Date: Fri, 24 Apr 2020 15:36:01 +0800
-Subject: [PATCH] mmu: Remove unneeded semicolon
-
-Fixes coccicheck warning:
-
-drivers/gpu/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h:307:2-3: Unneeded semicolon
-drivers/gpu/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c:583:2-3: Unneeded semicolon
-
-Reported-by: Hulk Robot <hulkci@huawei.com>
-Signed-off-by: Zheng Bin <zhengbin13@huawei.com>
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 2 +-
- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c
-index 41640e0584ac..199f94e15c5f 100644
---- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c
-+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c
-@@ -580,7 +580,7 @@ nvkm_vmm_iter(struct nvkm_vmm *vmm, const struct nvkm_vmm_page *page,
- 				it.pte[it.lvl]++;
- 			}
- 		}
--	};
-+	}
-
- 	nvkm_vmm_flush(&it);
- 	return ~0ULL;
-diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h
-index 5e55ecbd8005..d3f8f916d0db 100644
---- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h
-+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h
-@@ -304,7 +304,7 @@ int tu102_vmm_new(struct nvkm_mmu *, bool, u64, u64, void *, u32,
- 		FILL(VMM, PT, PTEI, _ptes, MAP, _addr);                        \
- 		PTEI += _ptes;                                                 \
- 		PTEN -= _ptes;                                                 \
--	};                                                                     \
-+	}                                                                      \
- 	nvkm_done((PT)->memory);                                               \
- } while(0)
-
--- 
-2.26.2
-
diff --git a/0001-modules-add-rhelversion-MODULE_INFO-tag.patch b/0001-modules-add-rhelversion-MODULE_INFO-tag.patch
index cd87459ff..b065c1bbd 100644
--- a/0001-modules-add-rhelversion-MODULE_INFO-tag.patch
+++ b/0001-modules-add-rhelversion-MODULE_INFO-tag.patch
@@ -94,7 +94,7 @@ index d849d06e4d44..15a1f464ba50 100644
 
  	/* Exported symbols */
 diff --git a/kernel/module.c b/kernel/module.c
-index 64a2b4daaaa5..821a1d681971 100644
+index a0f201d2e184..e8848dd77628 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
 @@ -799,6 +799,7 @@ static struct module_attribute modinfo_##field = {                    \
diff --git a/0001-platform-x86-sony-laptop-SNC-calls-should-handle-BUF.patch b/0001-platform-x86-sony-laptop-SNC-calls-should-handle-BUF.patch
deleted file mode 100644
index 743e38804..000000000
--- a/0001-platform-x86-sony-laptop-SNC-calls-should-handle-BUF.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mattia Dongili <malattia@linux.it>
-Date: Fri, 8 May 2020 09:14:04 +0900
-Subject: [PATCH] platform/x86: sony-laptop: SNC calls should handle BUFFER
- types
-
-After commit 6d232b29cfce ("ACPICA: Dispatcher: always generate buffer
-objects for ASL create_field() operator") ACPICA creates buffers even
-when new fields are small enough to fit into an integer.
-Many SNC calls counted on the old behaviour.
-Since sony-laptop already handles the INTEGER/BUFFER case in
-sony_nc_buffer_call, switch sony_nc_int_call to use its more generic
-function instead.
-
-Fixes: 6d232b29cfce ("ACPICA: Dispatcher: always generate buffer objects for ASL create_field() operator")
-Reported-by: Dominik Mierzejewski <dominik@greysector.net>
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207491
-Reported-by: William Bader <williambader@hotmail.com>
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1830150
-Signed-off-by: Mattia Dongili <malattia@linux.it>
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Upstream Status: linux-platform-drivers-x86/for-next
-(cherry picked from commit 47828d22539f76c8c9dcf2a55f18ea3a8039d8ef)
----
- drivers/platform/x86/sony-laptop.c | 53 +++++++++++++-----------------
- 1 file changed, 23 insertions(+), 30 deletions(-)
-
-diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
-index 51309f7ceede..6932cd11e660 100644
---- a/drivers/platform/x86/sony-laptop.c
-+++ b/drivers/platform/x86/sony-laptop.c
-@@ -757,33 +757,6 @@ static union acpi_object *__call_snc_method(acpi_handle handle, char *method,
- 	return result;
- }
-
--static int sony_nc_int_call(acpi_handle handle, char *name, int *value,
--		int *result)
--{
--	union acpi_object *object = NULL;
--	if (value) {
--		u64 v = *value;
--		object = __call_snc_method(handle, name, &v);
--	} else
--		object = __call_snc_method(handle, name, NULL);
--
--	if (!object)
--		return -EINVAL;
--
--	if (object->type != ACPI_TYPE_INTEGER) {
--		pr_warn("Invalid acpi_object: expected 0x%x got 0x%x\n",
--				ACPI_TYPE_INTEGER, object->type);
--		kfree(object);
--		return -EINVAL;
--	}
--
--	if (result)
--		*result = object->integer.value;
--
--	kfree(object);
--	return 0;
--}
--
- #define MIN(a, b)	(a > b ? b : a)
- static int sony_nc_buffer_call(acpi_handle handle, char *name, u64 *value,
- 		void *buffer, size_t buflen)
-@@ -795,17 +768,20 @@ static int sony_nc_buffer_call(acpi_handle handle, char *name, u64 *value,
- 	if (!object)
- 		return -EINVAL;
-
--	if (object->type == ACPI_TYPE_BUFFER) {
-+	if (!buffer) {
-+		/* do nothing */
-+	} else if (object->type == ACPI_TYPE_BUFFER) {
- 		len = MIN(buflen, object->buffer.length);
-+		memset(buffer, 0, buflen);
- 		memcpy(buffer, object->buffer.pointer, len);
-
- 	} else if (object->type == ACPI_TYPE_INTEGER) {
- 		len = MIN(buflen, sizeof(object->integer.value));
-+		memset(buffer, 0, buflen);
- 		memcpy(buffer, &object->integer.value, len);
-
- 	} else {
--		pr_warn("Invalid acpi_object: expected 0x%x got 0x%x\n",
--				ACPI_TYPE_BUFFER, object->type);
-+		pr_warn("Unexpected acpi_object: 0x%x\n", object->type);
- 		ret = -EINVAL;
- 	}
-
-@@ -813,6 +789,23 @@ static int sony_nc_buffer_call(acpi_handle handle, char *name, u64 *value,
- 	return ret;
- }
-
-+static int sony_nc_int_call(acpi_handle handle, char *name, int *value, int
-+		*result)
-+{
-+	int ret;
-+
-+	if (value) {
-+		u64 v = *value;
-+
-+		ret = sony_nc_buffer_call(handle, name, &v, result,
-+				sizeof(*result));
-+	} else {
-+		ret =  sony_nc_buffer_call(handle, name, NULL, result,
-+				sizeof(*result));
-+	}
-+	return ret;
-+}
-+
- struct sony_nc_handles {
- 	u16 cap[0x10];
- 	struct device_attribute devattr;
--- 
-2.26.2
-
diff --git a/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch b/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
index 4332472bb..0686272d3 100644
--- a/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
+++ b/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
@@ -41,7 +41,7 @@ index 4a71061974fd..9baf0b570c3d 100644
 +	return !!ipl_secure_flag;
 +}
 diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
-index 36445dd40fdb..b338a050c5aa 100644
+index 0f0b140b5558..5554ae03060f 100644
 --- a/arch/s390/kernel/setup.c
 +++ b/arch/s390/kernel/setup.c
 @@ -49,6 +49,7 @@
@@ -52,7 +52,7 @@ index 36445dd40fdb..b338a050c5aa 100644
 
  #include <asm/boot_data.h>
  #include <asm/ipl.h>
-@@ -1093,6 +1094,9 @@ void __init setup_arch(char **cmdline_p)
+@@ -1090,6 +1091,9 @@ void __init setup_arch(char **cmdline_p)
 
  	log_component_list();
 
diff --git a/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch b/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch
index 0e0717050..21930580b 100644
--- a/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch
+++ b/0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch
@@ -70,7 +70,7 @@ index a8d9310472df..381305889d89 100644
 
  #ifdef CONFIG_SECURITY_NETWORK
 diff --git a/security/lockdown/lockdown.c b/security/lockdown/lockdown.c
-index 5a952617a0eb..61cc3cdc4d25 100644
+index 87cbdc64d272..18555cf18da7 100644
 --- a/security/lockdown/lockdown.c
 +++ b/security/lockdown/lockdown.c
 @@ -73,6 +73,7 @@ static int lockdown_is_locked_down(enum lockdown_reason what)
diff --git a/Patchlist b/Patchlist
index 9ad0d7657..a30f5a032 100644
--- a/Patchlist
+++ b/Patchlist
@@ -74,26 +74,6 @@
 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
 0001-pwm-lpss-Fix-get_state-runtime-pm-reference-handling.patch
 0001-x86-Fix-compile-issues-with-rh_check_supported.patch
-0001-disp-gv100-expose-capabilities-class.patch
-0001-core-memory-remove-redundant-assignments-to-variable.patch
-0001-acr-Use-kmemdup-instead-of-kmalloc-and-memcpy.patch
-0001-drm-Use-generic-helper-to-check-_PR3-presence.patch
-0001-mmu-Remove-unneeded-semicolon.patch
-0001-device-rework-mmio-mapping-code-to-get-rid-of-second.patch
-0001-device-detect-if-changing-endianness-failed.patch
-0001-device-detect-vGPUs.patch
-0001-device-use-regular-PRI-accessors-in-chipset-detectio.patch
-0001-kms-Fix-regression-by-audio-component-transition.patch
-0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch
-0001-disp-hda-gt215-pass-head-to-nvkm_ior.hda.eld.patch
-0001-disp-hda-gf119-add-HAL-for-programming-device-entry-.patch
-0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch
-0001-disp-hda-gv100-NV_PDISP_SF_AUDIO_CNTRL0-register-mov.patch
-0001-kms-nv50-Initialize-core-channel-in-nouveau_display_.patch
-0001-kms-nv50-Probe-SOR-and-PIOR-caps-for-DP-interlacing-.patch
-0001-kms-gv100-Add-support-for-interlaced-modes.patch
-0001-kms-nv50-Move-8BPC-limit-for-MST-into-nv50_mstc_get_.patch
-0001-kms-nv50-Share-DP-SST-mode_valid-handling-with-MST.patch
 0001-virt-vbox-Fix-VBGL_IOCTL_VMMDEV_REQUEST_BIG-and-_LOG.patch
 0001-virt-vbox-Fix-guest-capabilities-mask-check.patch
 0001-virt-vbox-Rename-guest_caps-struct-members-to-set_gu.patch
@@ -101,4 +81,3 @@
 0001-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch
 0001-virt-vbox-Add-a-few-new-vmmdev-request-types-to-the-.patch
 0001-virt-vbox-Log-unknown-ioctl-requests-as-error.patch
-0001-platform-x86-sony-laptop-SNC-calls-should-handle-BUF.patch
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 5b30c30e1..7bb828a1b 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -368,6 +368,7 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_GLOBAL_TIMER=y
 # CONFIG_ARM_IMX6Q_CPUFREQ is not set
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
 CONFIG_ARM_IMX_CPUFREQ_DT=m
 CONFIG_ARM_MHU=m
 CONFIG_ARM_PL172_MPMC=m
@@ -379,6 +380,7 @@ CONFIG_ARM_PSCI=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
 CONFIG_ARM_QCOM_CPUFREQ_NVMEM=m
+# CONFIG_ARM_QCOM_SPM_CPUIDLE is not set
 CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SBSA_WATCHDOG=m
@@ -577,6 +579,7 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
@@ -663,6 +666,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
@@ -1526,6 +1531,7 @@ CONFIG_DRM_ANALOGIX_DP=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -1582,8 +1588,10 @@ CONFIG_DRM_MSM=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_SVM is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 CONFIG_DRM_NXP_PTN3460=m
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
+# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -1595,6 +1603,7 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 CONFIG_DRM_PANEL_LG_LG4573=m
@@ -1631,6 +1640,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 CONFIG_DRM_PANEL_TPO_TPG110=m
 CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 CONFIG_DRM_PANEL_XINGBANGDA_XBD599=m
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 CONFIG_DRM_PANEL=y
@@ -2227,6 +2237,7 @@ CONFIG_HFSPLUS_FS=m
 CONFIG_HI3660_MBOX=y
 CONFIG_HI6220_MBOX=y
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
@@ -2744,11 +2755,14 @@ CONFIG_INTEGRITY=y
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_XWAY_PHY=m
 CONFIG_INTERCONNECT=m
 CONFIG_INTERCONNECT_QCOM_MSM8916=m
@@ -3505,6 +3519,7 @@ CONFIG_MFD_CROS_EC_DEV=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 CONFIG_MFD_HI6421_PMIC=m
 CONFIG_MFD_HI655X_PMIC=m
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -3663,6 +3678,7 @@ CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_ROCKCHIP=m
 CONFIG_MMC_HSQ=m
 CONFIG_MMC_MESON_GX=m
+# CONFIG_MMC_MESON_MX_SDHC is not set
 CONFIG_MMC_MESON_MX_SDIO=m
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_MVSDIO=m
@@ -3845,6 +3861,7 @@ CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_PHYSMAP_VERSATILE is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -4932,7 +4949,10 @@ CONFIG_PSAMPLE=m
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
-# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
@@ -6681,6 +6701,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
@@ -7709,6 +7730,7 @@ CONFIG_ZOPT2201=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 908a6d761..fa220e9de 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -462,6 +462,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_ZONED is not set
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 # CONFIG_BLK_SED_OPAL is not set
 CONFIG_BLK_WBT_MQ=y
 # CONFIG_BLK_WBT_SQ is not set
@@ -1191,6 +1192,7 @@ CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
@@ -1231,6 +1233,7 @@ CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
@@ -1755,6 +1758,7 @@ CONFIG_HEADER_TEST=y
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 # CONFIG_HID_ACCUTOUCH is not set
@@ -2209,6 +2213,8 @@ CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_INTEL_PMC_IPC is not set
 # CONFIG_INTEL_PUNIT_IPC is not set
 CONFIG_INTEL_RST=m
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 # CONFIG_INTEL_SMARTCONNECT is not set
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
 # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set
@@ -2218,6 +2224,7 @@ CONFIG_INTEL_RST=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
@@ -2849,6 +2856,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -5342,6 +5350,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KASAN is not set
 # CONFIG_TEST_KMOD is not set
@@ -6121,6 +6130,7 @@ CONFIG_ZPOOL=y
 CONFIG_ZRAM=m
 CONFIG_ZRAM_MEMORY_TRACKING=y
 CONFIG_ZRAM_WRITEBACK=y
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 503dbf968..a66bbc999 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -368,6 +368,7 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_GLOBAL_TIMER=y
 # CONFIG_ARM_IMX6Q_CPUFREQ is not set
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
 CONFIG_ARM_IMX_CPUFREQ_DT=m
 CONFIG_ARM_MHU=m
 CONFIG_ARM_PL172_MPMC=m
@@ -379,6 +380,7 @@ CONFIG_ARM_PSCI=y
 # CONFIG_ARM_PTDUMP_DEBUGFS is not set
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
 CONFIG_ARM_QCOM_CPUFREQ_NVMEM=m
+# CONFIG_ARM_QCOM_SPM_CPUIDLE is not set
 CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SBSA_WATCHDOG=m
@@ -577,6 +579,7 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
@@ -663,6 +666,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
@@ -1518,6 +1523,7 @@ CONFIG_DRM_ANALOGIX_DP=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -1574,8 +1580,10 @@ CONFIG_DRM_MSM=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_SVM is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 CONFIG_DRM_NXP_PTN3460=m
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
+# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -1587,6 +1595,7 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 CONFIG_DRM_PANEL_LG_LG4573=m
@@ -1623,6 +1632,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 CONFIG_DRM_PANEL_TPO_TPG110=m
 CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 CONFIG_DRM_PANEL_XINGBANGDA_XBD599=m
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 CONFIG_DRM_PANEL=y
@@ -2211,6 +2221,7 @@ CONFIG_HFSPLUS_FS=m
 CONFIG_HI3660_MBOX=y
 CONFIG_HI6220_MBOX=y
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
@@ -2728,11 +2739,14 @@ CONFIG_INTEGRITY=y
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_XWAY_PHY=m
 CONFIG_INTERCONNECT=m
 CONFIG_INTERCONNECT_QCOM_MSM8916=m
@@ -3486,6 +3500,7 @@ CONFIG_MFD_CROS_EC_DEV=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 CONFIG_MFD_HI6421_PMIC=m
 CONFIG_MFD_HI655X_PMIC=m
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -3644,6 +3659,7 @@ CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_ROCKCHIP=m
 CONFIG_MMC_HSQ=m
 CONFIG_MMC_MESON_GX=m
+# CONFIG_MMC_MESON_MX_SDHC is not set
 CONFIG_MMC_MESON_MX_SDIO=m
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_MVSDIO=m
@@ -3826,6 +3842,7 @@ CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_PHYSMAP_VERSATILE is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -4913,7 +4930,10 @@ CONFIG_PSAMPLE=m
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
-# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
@@ -6660,6 +6680,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
@@ -7687,6 +7708,7 @@ CONFIG_ZOPT2201=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 7393ce842..230a8e0da 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -462,6 +462,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_ZONED is not set
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 # CONFIG_BLK_SED_OPAL is not set
 CONFIG_BLK_WBT_MQ=y
 # CONFIG_BLK_WBT_SQ is not set
@@ -1183,6 +1184,7 @@ CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
@@ -1223,6 +1225,7 @@ CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
@@ -1739,6 +1742,7 @@ CONFIG_HEADER_TEST=y
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 # CONFIG_HID_ACCUTOUCH is not set
@@ -2193,6 +2197,8 @@ CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_INTEL_PMC_IPC is not set
 # CONFIG_INTEL_PUNIT_IPC is not set
 CONFIG_INTEL_RST=m
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 # CONFIG_INTEL_SMARTCONNECT is not set
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
 # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set
@@ -2202,6 +2208,7 @@ CONFIG_INTEL_RST=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
@@ -2832,6 +2839,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -5322,6 +5330,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KASAN is not set
 # CONFIG_TEST_KMOD is not set
@@ -6100,6 +6109,7 @@ CONFIG_ZPOOL=y
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 CONFIG_ZRAM_WRITEBACK=y
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index a674e16ea..cc7ff6e04 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -354,6 +354,7 @@ CONFIG_ARM_HIGHBANK_CPUFREQ=m
 # CONFIG_ARM_HIGHBANK_CPUIDLE is not set
 CONFIG_ARM_IMX6Q_CPUFREQ=m
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
 # CONFIG_ARM_IMX_CPUFREQ_DT is not set
 CONFIG_ARM_KPROBES_TEST=m
 # CONFIG_ARM_LPAE is not set
@@ -370,6 +371,7 @@ CONFIG_ARM_PSCI_FW=y
 CONFIG_ARM_PSCI=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
+# CONFIG_ARM_QCOM_SPM_CPUIDLE is not set
 CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SCMI_CPUFREQ=m
@@ -584,6 +586,7 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
@@ -669,6 +672,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
@@ -1524,6 +1529,7 @@ CONFIG_DRM_ARMADA=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -1601,6 +1607,7 @@ CONFIG_DRM_MXSFB=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_SVM is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 CONFIG_DRM_NXP_PTN3460=m
 CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m
 CONFIG_DRM_OMAP_CONNECTOR_HDMI=m
@@ -1609,6 +1616,7 @@ CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
 CONFIG_DRM_OMAP=m
 CONFIG_DRM_OMAP_PANEL_DSI_CM=m
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
+# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -1620,6 +1628,7 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 CONFIG_DRM_PANEL_LG_LG4573=m
@@ -1656,6 +1665,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 CONFIG_DRM_PANEL_TPO_TPG110=m
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 CONFIG_DRM_PANEL=y
@@ -2251,6 +2261,7 @@ CONFIG_HERMES_PRISM=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
@@ -2775,11 +2786,14 @@ CONFIG_INTEGRITY=y
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
 CONFIG_INTERCONNECT_QCOM_MSM8916=m
@@ -3559,6 +3573,7 @@ CONFIG_MFD_DA9063=m
 CONFIG_MFD_EXYNOS_LPASS=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -3720,6 +3735,7 @@ CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_ROCKCHIP=m
 CONFIG_MMC_HSQ=m
 # CONFIG_MMC_MESON_GX is not set
+# CONFIG_MMC_MESON_MX_SDHC is not set
 CONFIG_MMC_MESON_MX_SDIO=m
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_MVSDIO=m
@@ -3917,6 +3933,7 @@ CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_PHYSMAP_VERSATILE is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -5030,7 +5047,10 @@ CONFIG_PSAMPLE=m
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
-# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
@@ -6907,6 +6927,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
@@ -8006,6 +8027,7 @@ CONFIG_ZOPT2201=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 4dc818ec8..49a147f07 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -354,6 +354,7 @@ CONFIG_ARM_HIGHBANK_CPUFREQ=m
 # CONFIG_ARM_HIGHBANK_CPUIDLE is not set
 CONFIG_ARM_IMX6Q_CPUFREQ=m
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
 # CONFIG_ARM_IMX_CPUFREQ_DT is not set
 CONFIG_ARM_KPROBES_TEST=m
 # CONFIG_ARM_LPAE is not set
@@ -370,6 +371,7 @@ CONFIG_ARM_PSCI_FW=y
 CONFIG_ARM_PSCI=y
 # CONFIG_ARM_PTDUMP_DEBUGFS is not set
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
+# CONFIG_ARM_QCOM_SPM_CPUIDLE is not set
 CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SCMI_CPUFREQ=m
@@ -584,6 +586,7 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
@@ -669,6 +672,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
@@ -1517,6 +1522,7 @@ CONFIG_DRM_ARMADA=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -1594,6 +1600,7 @@ CONFIG_DRM_MXSFB=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_SVM is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 CONFIG_DRM_NXP_PTN3460=m
 CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m
 CONFIG_DRM_OMAP_CONNECTOR_HDMI=m
@@ -1602,6 +1609,7 @@ CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
 CONFIG_DRM_OMAP=m
 CONFIG_DRM_OMAP_PANEL_DSI_CM=m
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
+# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -1613,6 +1621,7 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 CONFIG_DRM_PANEL_LG_LG4573=m
@@ -1649,6 +1658,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 CONFIG_DRM_PANEL_TPO_TPG110=m
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 CONFIG_DRM_PANEL=y
@@ -2236,6 +2246,7 @@ CONFIG_HERMES_PRISM=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
@@ -2760,11 +2771,14 @@ CONFIG_INTEGRITY=y
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
 CONFIG_INTERCONNECT_QCOM_MSM8916=m
@@ -3541,6 +3555,7 @@ CONFIG_MFD_DA9063=m
 CONFIG_MFD_EXYNOS_LPASS=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -3702,6 +3717,7 @@ CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_ROCKCHIP=m
 CONFIG_MMC_HSQ=m
 # CONFIG_MMC_MESON_GX is not set
+# CONFIG_MMC_MESON_MX_SDHC is not set
 CONFIG_MMC_MESON_MX_SDIO=m
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_MVSDIO=m
@@ -3899,6 +3915,7 @@ CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_PHYSMAP_VERSATILE is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -5012,7 +5029,10 @@ CONFIG_PSAMPLE=m
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
-# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
@@ -6887,6 +6907,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
@@ -7985,6 +8006,7 @@ CONFIG_ZOPT2201=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index ef5bf745c..2febcb5dd 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -346,6 +346,7 @@ CONFIG_ARM_HIGHBANK_CPUFREQ=m
 # CONFIG_ARM_HIGHBANK_CPUIDLE is not set
 # CONFIG_ARM_IMX6Q_CPUFREQ is not set
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
 # CONFIG_ARM_IMX_CPUFREQ_DT is not set
 CONFIG_ARM_KPROBES_TEST=m
 CONFIG_ARM_LPAE=y
@@ -362,6 +363,7 @@ CONFIG_ARM_PSCI_FW=y
 CONFIG_ARM_PSCI=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
+# CONFIG_ARM_QCOM_SPM_CPUIDLE is not set
 CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SCMI_CPUFREQ=m
@@ -563,6 +565,7 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
@@ -648,6 +651,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
@@ -1492,6 +1497,7 @@ CONFIG_DRM_ARMADA=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -1556,6 +1562,7 @@ CONFIG_DRM_MSM_DSI_10NM_PHY=y
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_SVM is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 CONFIG_DRM_NXP_PTN3460=m
 CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m
 CONFIG_DRM_OMAP_CONNECTOR_HDMI=m
@@ -1564,6 +1571,7 @@ CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
 CONFIG_DRM_OMAP=m
 CONFIG_DRM_OMAP_PANEL_DSI_CM=m
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
+# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -1575,6 +1583,7 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 CONFIG_DRM_PANEL_LG_LG4573=m
@@ -1611,6 +1620,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 CONFIG_DRM_PANEL_TPO_TPG110=m
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 CONFIG_DRM_PANEL=y
@@ -2197,6 +2207,7 @@ CONFIG_HERMES_PRISM=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
@@ -2708,11 +2719,14 @@ CONFIG_INTEGRITY=y
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
 CONFIG_INTERCONNECT_QCOM_MSM8916=m
@@ -3478,6 +3492,7 @@ CONFIG_MFD_CROS_EC_DEV=m
 CONFIG_MFD_EXYNOS_LPASS=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -3637,6 +3652,7 @@ CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_ROCKCHIP=m
 CONFIG_MMC_HSQ=m
 # CONFIG_MMC_MESON_GX is not set
+# CONFIG_MMC_MESON_MX_SDHC is not set
 CONFIG_MMC_MESON_MX_SDIO=m
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_MVSDIO=m
@@ -3817,6 +3833,7 @@ CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_PHYSMAP_VERSATILE is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -4899,7 +4916,10 @@ CONFIG_PSAMPLE=m
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
-# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
@@ -6664,6 +6684,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
@@ -7733,6 +7754,7 @@ CONFIG_ZOPT2201=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 65b3284d6..e461ca1bf 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -346,6 +346,7 @@ CONFIG_ARM_HIGHBANK_CPUFREQ=m
 # CONFIG_ARM_HIGHBANK_CPUIDLE is not set
 # CONFIG_ARM_IMX6Q_CPUFREQ is not set
 CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
 # CONFIG_ARM_IMX_CPUFREQ_DT is not set
 CONFIG_ARM_KPROBES_TEST=m
 CONFIG_ARM_LPAE=y
@@ -362,6 +363,7 @@ CONFIG_ARM_PSCI_FW=y
 CONFIG_ARM_PSCI=y
 # CONFIG_ARM_PTDUMP_DEBUGFS is not set
 CONFIG_ARM_QCOM_CPUFREQ_HW=m
+# CONFIG_ARM_QCOM_SPM_CPUIDLE is not set
 CONFIG_ARM_RASPBERRYPI_CPUFREQ=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SCMI_CPUFREQ=m
@@ -563,6 +565,7 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
@@ -648,6 +651,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
@@ -1485,6 +1490,7 @@ CONFIG_DRM_ARMADA=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -1549,6 +1555,7 @@ CONFIG_DRM_MSM_DSI_10NM_PHY=y
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_SVM is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 CONFIG_DRM_NXP_PTN3460=m
 CONFIG_DRM_OMAP_CONNECTOR_ANALOG_TV=m
 CONFIG_DRM_OMAP_CONNECTOR_HDMI=m
@@ -1557,6 +1564,7 @@ CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
 CONFIG_DRM_OMAP=m
 CONFIG_DRM_OMAP_PANEL_DSI_CM=m
 CONFIG_DRM_PANEL_ARM_VERSATILE=m
+# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -1568,6 +1576,7 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04=m
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 CONFIG_DRM_PANEL_LG_LG4573=m
@@ -1604,6 +1613,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 CONFIG_DRM_PANEL_TPO_TPG110=m
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 CONFIG_DRM_PANEL=y
@@ -2182,6 +2192,7 @@ CONFIG_HERMES_PRISM=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
@@ -2693,11 +2704,14 @@ CONFIG_INTEGRITY=y
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
 CONFIG_INTERCONNECT_QCOM_MSM8916=m
@@ -3460,6 +3474,7 @@ CONFIG_MFD_CROS_EC_DEV=m
 CONFIG_MFD_EXYNOS_LPASS=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -3619,6 +3634,7 @@ CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_ROCKCHIP=m
 CONFIG_MMC_HSQ=m
 # CONFIG_MMC_MESON_GX is not set
+# CONFIG_MMC_MESON_MX_SDHC is not set
 CONFIG_MMC_MESON_MX_SDIO=m
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_MVSDIO=m
@@ -3799,6 +3815,7 @@ CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_PHYSMAP_VERSATILE is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -4881,7 +4898,10 @@ CONFIG_PSAMPLE=m
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
-# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
@@ -6644,6 +6664,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
@@ -7712,6 +7733,7 @@ CONFIG_ZOPT2201=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index cd224733e..006a93fc0 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -266,7 +266,9 @@ CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
 CONFIG_ARM_PTDUMP_DEBUGFS=y
+# CONFIG_ARM_QCOM_SPM_CPUIDLE is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -438,6 +440,7 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
@@ -513,6 +516,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
@@ -1285,6 +1290,7 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -1328,7 +1334,9 @@ CONFIG_DRM_MGAG200=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_SVM is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -1340,6 +1348,7 @@ CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
@@ -1376,6 +1385,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 CONFIG_DRM_PANEL=y
@@ -1950,6 +1960,7 @@ CONFIG_HERMES_PRISM=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
@@ -2474,6 +2485,8 @@ CONFIG_INTEL_POWERCLAMP=m
 CONFIG_INTEL_PUNIT_IPC=m
 CONFIG_INTEL_RAPL=m
 CONFIG_INTEL_RST=m
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INTEL_SOC_PMIC_BXTWC=y
@@ -2494,6 +2507,7 @@ CONFIG_INTEL_TH_STH=m
 # CONFIG_INTEL_TXT is not set
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
 CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
@@ -3221,6 +3235,7 @@ CONFIG_MFD_CS5535=y
 # CONFIG_MFD_HI6421_PMIC is not set
 CONFIG_MFD_INTEL_LPSS_ACPI=y
 CONFIG_MFD_INTEL_LPSS_PCI=y
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -3370,6 +3385,7 @@ CONFIG_MMC_CQHCI=m
 # CONFIG_MMC_DW_BLUEFIELD is not set
 CONFIG_MMC_HSQ=m
 CONFIG_MMC=m
+# CONFIG_MMC_MESON_MX_SDHC is not set
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
@@ -3523,6 +3539,7 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -4505,7 +4522,10 @@ CONFIG_PSAMPLE=m
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
-# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
@@ -5105,7 +5125,7 @@ CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_AMC6821=m
-# CONFIG_SENSORS_AMD_ENERGY is not set
+CONFIG_SENSORS_AMD_ENERGY=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_SENSORS_APPLESMC=m
 # CONFIG_SENSORS_AS370 is not set
@@ -5827,7 +5847,6 @@ CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_FSI=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
@@ -6025,6 +6044,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
@@ -7061,6 +7081,7 @@ CONFIG_ZOPT2201=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 5b2cc1a00..4a3c79e1f 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -266,6 +266,8 @@ CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
+# CONFIG_ARM_QCOM_SPM_CPUIDLE is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -437,6 +439,7 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
@@ -512,6 +515,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
@@ -1276,6 +1281,7 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -1319,7 +1325,9 @@ CONFIG_DRM_MGAG200=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_SVM is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -1331,6 +1339,7 @@ CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
@@ -1367,6 +1376,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 CONFIG_DRM_PANEL=y
@@ -1933,6 +1943,7 @@ CONFIG_HERMES_PRISM=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
@@ -2457,6 +2468,8 @@ CONFIG_INTEL_POWERCLAMP=m
 CONFIG_INTEL_PUNIT_IPC=m
 CONFIG_INTEL_RAPL=m
 CONFIG_INTEL_RST=m
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INTEL_SOC_PMIC_BXTWC=y
@@ -2477,6 +2490,7 @@ CONFIG_INTEL_TH_STH=m
 # CONFIG_INTEL_TXT is not set
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
 CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
@@ -3202,6 +3216,7 @@ CONFIG_MFD_CS5535=y
 # CONFIG_MFD_HI6421_PMIC is not set
 CONFIG_MFD_INTEL_LPSS_ACPI=y
 CONFIG_MFD_INTEL_LPSS_PCI=y
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -3351,6 +3366,7 @@ CONFIG_MMC_CQHCI=m
 # CONFIG_MMC_DW_BLUEFIELD is not set
 CONFIG_MMC_HSQ=m
 CONFIG_MMC=m
+# CONFIG_MMC_MESON_MX_SDHC is not set
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
@@ -3504,6 +3520,7 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -4486,7 +4503,10 @@ CONFIG_PSAMPLE=m
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
-# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
@@ -5086,7 +5106,7 @@ CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_AMC6821=m
-# CONFIG_SENSORS_AMD_ENERGY is not set
+CONFIG_SENSORS_AMD_ENERGY=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_SENSORS_APPLESMC=m
 # CONFIG_SENSORS_AS370 is not set
@@ -5806,7 +5826,6 @@ CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_FSI=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
@@ -6004,6 +6023,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
@@ -7039,6 +7059,7 @@ CONFIG_ZOPT2201=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index a0eddc7e4..2fc92ae45 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -208,7 +208,9 @@ CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
 CONFIG_ARM_PTDUMP_DEBUGFS=y
+# CONFIG_ARM_QCOM_SPM_CPUIDLE is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -373,6 +375,7 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
@@ -448,6 +451,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
@@ -1188,6 +1193,7 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -1220,7 +1226,9 @@ CONFIG_DRM_MGAG200=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_SVM is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -1232,6 +1240,7 @@ CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
@@ -1268,6 +1277,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 CONFIG_DRM_PANEL=y
@@ -1781,6 +1791,7 @@ CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_HI8435 is not set
 # CONFIG_HIBERNATION is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
 CONFIG_HID_ACRUX_FF=y
@@ -2243,11 +2254,14 @@ CONFIG_INTEGRITY=y
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
@@ -2955,6 +2969,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_DLN2 is not set
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -3095,6 +3110,7 @@ CONFIG_MMC_CQHCI=m
 # CONFIG_MMC_DW_BLUEFIELD is not set
 CONFIG_MMC_HSQ=m
 CONFIG_MMC=m
+# CONFIG_MMC_MESON_MX_SDHC is not set
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
@@ -3241,6 +3257,7 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 CONFIG_MTD_POWERNV_FLASH=m
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -4200,7 +4217,10 @@ CONFIG_PSERIES_ENERGY=m
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
-# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
@@ -5432,7 +5452,6 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_FSI=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
@@ -5622,6 +5641,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
@@ -6546,6 +6566,7 @@ CONFIG_ZOPT2201=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 9e0b1fc41..5eb81322e 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -356,6 +356,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_ZONED is not set
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 # CONFIG_BLK_SED_OPAL is not set
 CONFIG_BLK_WBT_MQ=y
 # CONFIG_BLK_WBT_SQ is not set
@@ -1070,6 +1071,7 @@ CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
@@ -1109,6 +1111,7 @@ CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
@@ -1628,6 +1631,7 @@ CONFIG_HEADER_TEST=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HI8435 is not set
 # CONFIG_HIBERNATION is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HID_A4TECH=m
 # CONFIG_HID_ACCUTOUCH is not set
 # CONFIG_HID_ACRUX_FF is not set
@@ -2079,6 +2083,8 @@ CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_INTEL_PMC_IPC is not set
 # CONFIG_INTEL_PUNIT_IPC is not set
 CONFIG_INTEL_RST=m
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 # CONFIG_INTEL_SMARTCONNECT is not set
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
 # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set
@@ -2088,6 +2094,7 @@ CONFIG_INTEL_RST=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
@@ -2728,6 +2735,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -5185,6 +5193,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KASAN is not set
 # CONFIG_TEST_KMOD is not set
@@ -5968,6 +5977,7 @@ CONFIG_ZPOOL=y
 CONFIG_ZRAM=m
 CONFIG_ZRAM_MEMORY_TRACKING=y
 CONFIG_ZRAM_WRITEBACK=y
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index cdb3bef4f..2b7353c57 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -208,6 +208,8 @@ CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
+# CONFIG_ARM_QCOM_SPM_CPUIDLE is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -372,6 +374,7 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
@@ -447,6 +450,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
@@ -1179,6 +1184,7 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -1211,7 +1217,9 @@ CONFIG_DRM_MGAG200=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_SVM is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -1223,6 +1231,7 @@ CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
@@ -1259,6 +1268,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 CONFIG_DRM_PANEL=y
@@ -1764,6 +1774,7 @@ CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_HI8435 is not set
 # CONFIG_HIBERNATION is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
 CONFIG_HID_ACRUX_FF=y
@@ -2226,11 +2237,14 @@ CONFIG_INTEGRITY=y
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
@@ -2935,6 +2949,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_DLN2 is not set
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -3075,6 +3090,7 @@ CONFIG_MMC_CQHCI=m
 # CONFIG_MMC_DW_BLUEFIELD is not set
 CONFIG_MMC_HSQ=m
 CONFIG_MMC=m
+# CONFIG_MMC_MESON_MX_SDHC is not set
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
@@ -3221,6 +3237,7 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 CONFIG_MTD_POWERNV_FLASH=m
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -4180,7 +4197,10 @@ CONFIG_PSERIES_ENERGY=m
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
-# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
@@ -5410,7 +5430,6 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_FSI=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
@@ -5600,6 +5619,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
@@ -6523,6 +6543,7 @@ CONFIG_ZOPT2201=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 22dbea8bd..04cedfaf7 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -356,6 +356,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_ZONED is not set
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 # CONFIG_BLK_SED_OPAL is not set
 CONFIG_BLK_WBT_MQ=y
 # CONFIG_BLK_WBT_SQ is not set
@@ -1062,6 +1063,7 @@ CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
@@ -1101,6 +1103,7 @@ CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
@@ -1612,6 +1615,7 @@ CONFIG_HEADER_TEST=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HI8435 is not set
 # CONFIG_HIBERNATION is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HID_A4TECH=m
 # CONFIG_HID_ACCUTOUCH is not set
 # CONFIG_HID_ACRUX_FF is not set
@@ -2063,6 +2067,8 @@ CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_INTEL_PMC_IPC is not set
 # CONFIG_INTEL_PUNIT_IPC is not set
 CONFIG_INTEL_RST=m
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 # CONFIG_INTEL_SMARTCONNECT is not set
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
 # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set
@@ -2072,6 +2078,7 @@ CONFIG_INTEL_RST=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
@@ -2712,6 +2719,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -5167,6 +5175,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KASAN is not set
 # CONFIG_TEST_KMOD is not set
@@ -5950,6 +5959,7 @@ CONFIG_ZPOOL=y
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 CONFIG_ZRAM_WRITEBACK=y
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 1ae5e3422..bb51525b8 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -212,7 +212,9 @@ CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
 CONFIG_ARM_PTDUMP_DEBUGFS=y
+# CONFIG_ARM_QCOM_SPM_CPUIDLE is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -377,6 +379,7 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
@@ -453,6 +456,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_XPRAM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
@@ -1195,6 +1200,7 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
 # CONFIG_DRM_AST is not set
 # CONFIG_DRM_BOCHS is not set
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -1227,7 +1233,9 @@ CONFIG_DRM=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 # CONFIG_DRM_NOUVEAU is not set
 # CONFIG_DRM_NOUVEAU_SVM is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -1239,6 +1247,7 @@ CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
@@ -1275,6 +1284,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 CONFIG_DRM_PANEL=y
@@ -1774,6 +1784,7 @@ CONFIG_HERMES_PRISM=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
@@ -2222,11 +2233,14 @@ CONFIG_INTEGRITY=y
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
@@ -2929,6 +2943,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_DLN2 is not set
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -3069,6 +3084,7 @@ CONFIG_MMC_CQHCI=m
 # CONFIG_MMC_DW_BLUEFIELD is not set
 CONFIG_MMC_HSQ=m
 # CONFIG_MMC is not set
+# CONFIG_MMC_MESON_MX_SDHC is not set
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
@@ -3212,6 +3228,7 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -4128,7 +4145,10 @@ CONFIG_PSAMPLE=m
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
-# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
@@ -5373,7 +5393,6 @@ CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_FSI=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
@@ -5560,6 +5579,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
@@ -6487,6 +6507,7 @@ CONFIG_ZOPT2201=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 1efeb1d3e..8dc602cd1 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -357,6 +357,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_XPRAM is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_ZONED is not set
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 # CONFIG_BLK_SED_OPAL is not set
 CONFIG_BLK_WBT_MQ=y
 # CONFIG_BLK_WBT_SQ is not set
@@ -1075,6 +1076,7 @@ CONFIG_DRM_AMDGPU_GART_DEBUGFS=y
 # CONFIG_DRM_AST is not set
 # CONFIG_DRM_BOCHS is not set
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
@@ -1114,6 +1116,7 @@ CONFIG_DRM=m
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 # CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
@@ -1623,6 +1626,7 @@ CONFIG_HEADER_TEST=y
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 # CONFIG_HID_ACCUTOUCH is not set
@@ -2055,6 +2059,8 @@ CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_INTEL_PMC_IPC is not set
 # CONFIG_INTEL_PUNIT_IPC is not set
 CONFIG_INTEL_RST=m
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 # CONFIG_INTEL_SMARTCONNECT is not set
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
 # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set
@@ -2064,6 +2070,7 @@ CONFIG_INTEL_RST=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
@@ -2703,6 +2710,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -5124,6 +5132,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KASAN is not set
 # CONFIG_TEST_KMOD is not set
@@ -5921,6 +5930,7 @@ CONFIG_ZONE_DEVICE=y
 CONFIG_ZRAM=m
 CONFIG_ZRAM_MEMORY_TRACKING=y
 CONFIG_ZRAM_WRITEBACK=y
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index b271ee509..6cef4989e 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -212,6 +212,8 @@ CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
+# CONFIG_ARM_QCOM_SPM_CPUIDLE is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -376,6 +378,7 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
@@ -452,6 +455,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_XPRAM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
@@ -1186,6 +1191,7 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
 # CONFIG_DRM_AST is not set
 # CONFIG_DRM_BOCHS is not set
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -1218,7 +1224,9 @@ CONFIG_DRM=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 # CONFIG_DRM_NOUVEAU is not set
 # CONFIG_DRM_NOUVEAU_SVM is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -1230,6 +1238,7 @@ CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
@@ -1266,6 +1275,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 CONFIG_DRM_PANEL=y
@@ -1757,6 +1767,7 @@ CONFIG_HERMES_PRISM=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
@@ -2205,11 +2216,14 @@ CONFIG_INTEGRITY=y
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
@@ -2909,6 +2923,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_DLN2 is not set
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
@@ -3049,6 +3064,7 @@ CONFIG_MMC_CQHCI=m
 # CONFIG_MMC_DW_BLUEFIELD is not set
 CONFIG_MMC_HSQ=m
 # CONFIG_MMC is not set
+# CONFIG_MMC_MESON_MX_SDHC is not set
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
@@ -3192,6 +3208,7 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -4108,7 +4125,10 @@ CONFIG_PSAMPLE=m
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
-# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
@@ -5351,7 +5371,6 @@ CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_FSI=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
@@ -5538,6 +5557,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
@@ -6464,6 +6484,7 @@ CONFIG_ZOPT2201=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 5089bbf78..26b45762d 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -357,6 +357,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_XPRAM is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_ZONED is not set
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 # CONFIG_BLK_SED_OPAL is not set
 CONFIG_BLK_WBT_MQ=y
 # CONFIG_BLK_WBT_SQ is not set
@@ -1067,6 +1068,7 @@ CONFIG_DRM_AMD_DC=y
 # CONFIG_DRM_AST is not set
 # CONFIG_DRM_BOCHS is not set
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
@@ -1106,6 +1108,7 @@ CONFIG_DRM=m
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 # CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
@@ -1607,6 +1610,7 @@ CONFIG_HEADER_TEST=y
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 # CONFIG_HID_ACCUTOUCH is not set
@@ -2039,6 +2043,8 @@ CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_INTEL_PMC_IPC is not set
 # CONFIG_INTEL_PUNIT_IPC is not set
 CONFIG_INTEL_RST=m
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 # CONFIG_INTEL_SMARTCONNECT is not set
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
 # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set
@@ -2048,6 +2054,7 @@ CONFIG_INTEL_RST=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
@@ -2687,6 +2694,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -5106,6 +5114,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KASAN is not set
 # CONFIG_TEST_KMOD is not set
@@ -5903,6 +5912,7 @@ CONFIG_ZONE_DEVICE=y
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 CONFIG_ZRAM_WRITEBACK=y
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 47b15db69..be4ae8361 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -361,6 +361,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_XPRAM is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_ZONED is not set
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 # CONFIG_BLK_SED_OPAL is not set
 CONFIG_BLK_WBT_MQ=y
 # CONFIG_BLK_WBT_SQ is not set
@@ -1077,6 +1078,7 @@ CONFIG_DRM_AMD_DC=y
 # CONFIG_DRM_AST is not set
 # CONFIG_DRM_BOCHS is not set
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 # CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
@@ -1116,6 +1118,7 @@ CONFIG_DRM=m
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 # CONFIG_DRM_NOUVEAU is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
@@ -1622,6 +1625,7 @@ CONFIG_HEADER_TEST=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HI8435 is not set
 # CONFIG_HIBERNATION is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HID_A4TECH=m
 # CONFIG_HID_ACCUTOUCH is not set
 # CONFIG_HID_ACRUX_FF is not set
@@ -2058,6 +2062,8 @@ CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_INTEL_PMC_IPC is not set
 # CONFIG_INTEL_PUNIT_IPC is not set
 CONFIG_INTEL_RST=m
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 # CONFIG_INTEL_SMARTCONNECT is not set
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
 # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set
@@ -2067,6 +2073,7 @@ CONFIG_INTEL_RST=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
@@ -2707,6 +2714,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -5140,6 +5148,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KASAN is not set
 # CONFIG_TEST_KMOD is not set
@@ -5939,6 +5948,7 @@ CONFIG_ZONE_DEVICE=y
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM=y
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 731ba3a17..1f7d569a4 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -268,7 +268,9 @@ CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
 CONFIG_ARM_PTDUMP_DEBUGFS=y
+# CONFIG_ARM_QCOM_SPM_CPUIDLE is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -443,6 +445,7 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
@@ -518,6 +521,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
@@ -1321,6 +1326,7 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -1364,7 +1370,9 @@ CONFIG_DRM_MGAG200=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_SVM is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -1376,6 +1384,7 @@ CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
@@ -1412,6 +1421,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 CONFIG_DRM_PANEL=y
@@ -1984,6 +1994,7 @@ CONFIG_HERMES_PRISM=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
@@ -2520,6 +2531,8 @@ CONFIG_INTEL_POWERCLAMP=m
 CONFIG_INTEL_PUNIT_IPC=m
 CONFIG_INTEL_RAPL=m
 CONFIG_INTEL_RST=m
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INTEL_SOC_PMIC_BXTWC=y
@@ -2541,6 +2554,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_TXT=y
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
 CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
@@ -3267,6 +3281,7 @@ CONFIG_MFD_CROS_EC_DEV=m
 # CONFIG_MFD_HI6421_PMIC is not set
 CONFIG_MFD_INTEL_LPSS_ACPI=y
 CONFIG_MFD_INTEL_LPSS_PCI=y
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -3415,6 +3430,7 @@ CONFIG_MMC_CQHCI=m
 # CONFIG_MMC_DW_BLUEFIELD is not set
 CONFIG_MMC_HSQ=m
 CONFIG_MMC=m
+# CONFIG_MMC_MESON_MX_SDHC is not set
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
@@ -3563,6 +3579,7 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -4542,7 +4559,10 @@ CONFIG_PSAMPLE=m
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
-# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
@@ -5147,7 +5167,7 @@ CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_AMC6821=m
-# CONFIG_SENSORS_AMD_ENERGY is not set
+CONFIG_SENSORS_AMD_ENERGY=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_SENSORS_APPLESMC=m
 # CONFIG_SENSORS_AS370 is not set
@@ -5879,7 +5899,6 @@ CONFIG_SPARSEMEM=y
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_FSI=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
@@ -6077,6 +6096,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
@@ -7112,6 +7132,7 @@ CONFIG_ZOPT2201=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index fe723c147..741a2ee47 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -392,6 +392,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_ZONED is not set
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 # CONFIG_BLK_SED_OPAL is not set
 CONFIG_BLK_WBT_MQ=y
 # CONFIG_BLK_WBT_SQ is not set
@@ -1146,6 +1147,7 @@ CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
@@ -1191,6 +1193,7 @@ CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
@@ -1738,6 +1741,7 @@ CONFIG_HEADER_TEST=y
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 # CONFIG_HID_ACCUTOUCH is not set
@@ -2234,6 +2238,8 @@ CONFIG_INTEL_POWERCLAMP=m
 CONFIG_INTEL_RAPL=m
 CONFIG_INTEL_RDT=y
 CONFIG_INTEL_RST=m
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 # CONFIG_INTEL_SMARTCONNECT is not set
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
 # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set
@@ -2253,6 +2259,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_TXT=y
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
 CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
@@ -2896,6 +2903,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_MFD_INTEL_LPSS_ACPI=y
 CONFIG_MFD_INTEL_LPSS_PCI=y
 CONFIG_MFD_INTEL_LPSS=y
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -5393,6 +5401,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KASAN is not set
 # CONFIG_TEST_KMOD is not set
@@ -6253,6 +6262,7 @@ CONFIG_ZPOOL=y
 CONFIG_ZRAM=m
 CONFIG_ZRAM_MEMORY_TRACKING=y
 CONFIG_ZRAM_WRITEBACK=y
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index fc015795c..e63092566 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -268,6 +268,8 @@ CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
+# CONFIG_ARM_IMX_BUS_DEVFREQ is not set
+# CONFIG_ARM_QCOM_SPM_CPUIDLE is not set
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 CONFIG_ASUS_LAPTOP=m
@@ -442,6 +444,7 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCACHE_ASYNC_REGISTRAION is not set
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
@@ -517,6 +520,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
@@ -1312,6 +1317,7 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DISPLAY_CONNECTOR=m
@@ -1355,7 +1361,9 @@ CONFIG_DRM_MGAG200=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
 # CONFIG_DRM_NOUVEAU_SVM is not set
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
+# CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -1367,6 +1375,7 @@ CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
+# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_LG_LB035Q02 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
@@ -1403,6 +1412,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
+# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
 # CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 CONFIG_DRM_PANEL=y
@@ -1967,6 +1977,7 @@ CONFIG_HERMES_PRISM=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACCUTOUCH=m
@@ -2503,6 +2514,8 @@ CONFIG_INTEL_POWERCLAMP=m
 CONFIG_INTEL_PUNIT_IPC=m
 CONFIG_INTEL_RAPL=m
 CONFIG_INTEL_RST=m
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INTEL_SOC_PMIC_BXTWC=y
@@ -2524,6 +2537,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_TXT=y
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
 CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
@@ -3248,6 +3262,7 @@ CONFIG_MFD_CROS_EC_DEV=m
 # CONFIG_MFD_HI6421_PMIC is not set
 CONFIG_MFD_INTEL_LPSS_ACPI=y
 CONFIG_MFD_INTEL_LPSS_PCI=y
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -3396,6 +3411,7 @@ CONFIG_MMC_CQHCI=m
 # CONFIG_MMC_DW_BLUEFIELD is not set
 CONFIG_MMC_HSQ=m
 CONFIG_MMC=m
+# CONFIG_MMC_MESON_MX_SDHC is not set
 # CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
@@ -3544,6 +3560,7 @@ CONFIG_MTD_NAND_CADENCE=m
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_PSTORE is not set
 # CONFIG_MTD_RAM is not set
 CONFIG_MTD_RAW_NAND=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -4523,7 +4540,10 @@ CONFIG_PSAMPLE=m
 CONFIG_PSI=y
 # CONFIG_PSTORE_842_COMPRESS_DEFAULT is not set
 CONFIG_PSTORE_842_COMPRESS=y
-# CONFIG_PSTORE_BLK is not set
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_PSTORE_CONSOLE is not set
 CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
@@ -5128,7 +5148,7 @@ CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_AMC6821=m
-# CONFIG_SENSORS_AMD_ENERGY is not set
+CONFIG_SENSORS_AMD_ENERGY=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_SENSORS_APPLESMC=m
 # CONFIG_SENSORS_AS370 is not set
@@ -5858,7 +5878,6 @@ CONFIG_SPARSEMEM=y
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_FSI=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
@@ -6056,6 +6075,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
@@ -7090,6 +7110,7 @@ CONFIG_ZOPT2201=m
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 # CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index e8c4fb108..f714e8e83 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -392,6 +392,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_ZONED is not set
+# CONFIG_BLK_INLINE_ENCRYPTION is not set
 # CONFIG_BLK_SED_OPAL is not set
 CONFIG_BLK_WBT_MQ=y
 # CONFIG_BLK_WBT_SQ is not set
@@ -1138,6 +1139,7 @@ CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHRONTEL_CH7033 is not set
 CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
@@ -1183,6 +1185,7 @@ CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU=m
+# CONFIG_DRM_NWL_MIPI_DSI is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
@@ -1722,6 +1725,7 @@ CONFIG_HEADER_TEST=y
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HI8435 is not set
+CONFIG_HIBERNATION_SNAPSHOT_DEV=y
 CONFIG_HIBERNATION=y
 CONFIG_HID_A4TECH=m
 # CONFIG_HID_ACCUTOUCH is not set
@@ -2218,6 +2222,8 @@ CONFIG_INTEL_POWERCLAMP=m
 CONFIG_INTEL_RAPL=m
 CONFIG_INTEL_RDT=y
 CONFIG_INTEL_RST=m
+# CONFIG_INTEL_SCU_PCI is not set
+# CONFIG_INTEL_SCU_PLATFORM is not set
 # CONFIG_INTEL_SMARTCONNECT is not set
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
 # CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set
@@ -2237,6 +2243,7 @@ CONFIG_INTEL_TURBO_MAX_3=y
 CONFIG_INTEL_TXT=y
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
 CONFIG_INTEL_VBTN=m
+# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
@@ -2879,6 +2886,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_MFD_INTEL_LPSS_ACPI=y
 CONFIG_MFD_INTEL_LPSS_PCI=y
 CONFIG_MFD_INTEL_LPSS=y
+# CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -5373,6 +5381,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_HMM is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_KASAN is not set
 # CONFIG_TEST_KMOD is not set
@@ -6233,6 +6242,7 @@ CONFIG_ZPOOL=y
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
 CONFIG_ZRAM_WRITEBACK=y
+# CONFIG_ZSMALLOC_PGTABLE_MAPPING is not set
 CONFIG_ZSMALLOC_STAT=y
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set
diff --git a/kernel.spec b/kernel.spec
index 6e4141aa4..5f385af59 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 0.rc0.20200603gitf359287765c0.1
+%global distro_build 0.rc0.20200603gitd6f9469a03d8.1
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -69,10 +69,10 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.8.0
-%define pkgrelease 0.rc0.20200603gitf359287765c0.1
+%define pkgrelease 0.rc0.20200603gitd6f9469a03d8.1
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20200603gitf359287765c0.1%{?buildid}%{?dist}
+%define specrelease 0.rc0.20200603gitd6f9469a03d8.1%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -564,7 +564,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200603gitf359287765c0.tar.xz
+Source0: linux-20200603gitd6f9469a03d8.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -779,34 +779,13 @@ Patch74: 0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch
 Patch75: 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
 Patch76: 0001-pwm-lpss-Fix-get_state-runtime-pm-reference-handling.patch
 Patch77: 0001-x86-Fix-compile-issues-with-rh_check_supported.patch
-Patch78: 0001-disp-gv100-expose-capabilities-class.patch
-Patch79: 0001-core-memory-remove-redundant-assignments-to-variable.patch
-Patch80: 0001-acr-Use-kmemdup-instead-of-kmalloc-and-memcpy.patch
-Patch81: 0001-drm-Use-generic-helper-to-check-_PR3-presence.patch
-Patch82: 0001-mmu-Remove-unneeded-semicolon.patch
-Patch83: 0001-device-rework-mmio-mapping-code-to-get-rid-of-second.patch
-Patch84: 0001-device-detect-if-changing-endianness-failed.patch
-Patch85: 0001-device-detect-vGPUs.patch
-Patch86: 0001-device-use-regular-PRI-accessors-in-chipset-detectio.patch
-Patch87: 0001-kms-Fix-regression-by-audio-component-transition.patch
-Patch88: 0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch
-Patch89: 0001-disp-hda-gt215-pass-head-to-nvkm_ior.hda.eld.patch
-Patch90: 0001-disp-hda-gf119-add-HAL-for-programming-device-entry-.patch
-Patch91: 0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch
-Patch92: 0001-disp-hda-gv100-NV_PDISP_SF_AUDIO_CNTRL0-register-mov.patch
-Patch93: 0001-kms-nv50-Initialize-core-channel-in-nouveau_display_.patch
-Patch94: 0001-kms-nv50-Probe-SOR-and-PIOR-caps-for-DP-interlacing-.patch
-Patch95: 0001-kms-gv100-Add-support-for-interlaced-modes.patch
-Patch96: 0001-kms-nv50-Move-8BPC-limit-for-MST-into-nv50_mstc_get_.patch
-Patch97: 0001-kms-nv50-Share-DP-SST-mode_valid-handling-with-MST.patch
-Patch98: 0001-virt-vbox-Fix-VBGL_IOCTL_VMMDEV_REQUEST_BIG-and-_LOG.patch
-Patch99: 0001-virt-vbox-Fix-guest-capabilities-mask-check.patch
-Patch100: 0001-virt-vbox-Rename-guest_caps-struct-members-to-set_gu.patch
-Patch101: 0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.patch
-Patch102: 0001-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch
-Patch103: 0001-virt-vbox-Add-a-few-new-vmmdev-request-types-to-the-.patch
-Patch104: 0001-virt-vbox-Log-unknown-ioctl-requests-as-error.patch
-Patch105: 0001-platform-x86-sony-laptop-SNC-calls-should-handle-BUF.patch
+Patch78: 0001-virt-vbox-Fix-VBGL_IOCTL_VMMDEV_REQUEST_BIG-and-_LOG.patch
+Patch79: 0001-virt-vbox-Fix-guest-capabilities-mask-check.patch
+Patch80: 0001-virt-vbox-Rename-guest_caps-struct-members-to-set_gu.patch
+Patch81: 0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.patch
+Patch82: 0001-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch
+Patch83: 0001-virt-vbox-Add-a-few-new-vmmdev-request-types-to-the-.patch
+Patch84: 0001-virt-vbox-Log-unknown-ioctl-requests-as-error.patch
 
 %endif
 
@@ -1302,8 +1281,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20200603gitf359287765c0 -c
-mv linux-20200603gitf359287765c0 linux-%{KVERREL}
+%setup -q -n kernel-20200603gitd6f9469a03d8 -c
+mv linux-20200603gitd6f9469a03d8 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -1386,26 +1365,6 @@ ApplyOptionalPatch 0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.pat
 ApplyOptionalPatch 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch
 ApplyOptionalPatch 0001-pwm-lpss-Fix-get_state-runtime-pm-reference-handling.patch
 ApplyOptionalPatch 0001-x86-Fix-compile-issues-with-rh_check_supported.patch
-ApplyOptionalPatch 0001-disp-gv100-expose-capabilities-class.patch
-ApplyOptionalPatch 0001-core-memory-remove-redundant-assignments-to-variable.patch
-ApplyOptionalPatch 0001-acr-Use-kmemdup-instead-of-kmalloc-and-memcpy.patch
-ApplyOptionalPatch 0001-drm-Use-generic-helper-to-check-_PR3-presence.patch
-ApplyOptionalPatch 0001-mmu-Remove-unneeded-semicolon.patch
-ApplyOptionalPatch 0001-device-rework-mmio-mapping-code-to-get-rid-of-second.patch
-ApplyOptionalPatch 0001-device-detect-if-changing-endianness-failed.patch
-ApplyOptionalPatch 0001-device-detect-vGPUs.patch
-ApplyOptionalPatch 0001-device-use-regular-PRI-accessors-in-chipset-detectio.patch
-ApplyOptionalPatch 0001-kms-Fix-regression-by-audio-component-transition.patch
-ApplyOptionalPatch 0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch
-ApplyOptionalPatch 0001-disp-hda-gt215-pass-head-to-nvkm_ior.hda.eld.patch
-ApplyOptionalPatch 0001-disp-hda-gf119-add-HAL-for-programming-device-entry-.patch
-ApplyOptionalPatch 0001-disp-hda-gf119-select-HDA-device-entry-based-on-boun.patch
-ApplyOptionalPatch 0001-disp-hda-gv100-NV_PDISP_SF_AUDIO_CNTRL0-register-mov.patch
-ApplyOptionalPatch 0001-kms-nv50-Initialize-core-channel-in-nouveau_display_.patch
-ApplyOptionalPatch 0001-kms-nv50-Probe-SOR-and-PIOR-caps-for-DP-interlacing-.patch
-ApplyOptionalPatch 0001-kms-gv100-Add-support-for-interlaced-modes.patch
-ApplyOptionalPatch 0001-kms-nv50-Move-8BPC-limit-for-MST-into-nv50_mstc_get_.patch
-ApplyOptionalPatch 0001-kms-nv50-Share-DP-SST-mode_valid-handling-with-MST.patch
 ApplyOptionalPatch 0001-virt-vbox-Fix-VBGL_IOCTL_VMMDEV_REQUEST_BIG-and-_LOG.patch
 ApplyOptionalPatch 0001-virt-vbox-Fix-guest-capabilities-mask-check.patch
 ApplyOptionalPatch 0001-virt-vbox-Rename-guest_caps-struct-members-to-set_gu.patch
@@ -1413,7 +1372,6 @@ ApplyOptionalPatch 0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.pat
 ApplyOptionalPatch 0001-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch
 ApplyOptionalPatch 0001-virt-vbox-Add-a-few-new-vmmdev-request-types-to-the-.patch
 ApplyOptionalPatch 0001-virt-vbox-Log-unknown-ioctl-requests-as-error.patch
-ApplyOptionalPatch 0001-platform-x86-sony-laptop-SNC-calls-should-handle-BUF.patch
 
 %endif
 
@@ -2830,8 +2788,9 @@ fi
 #
 #
 %changelog
-* Tue Jun 02 2020 CKI@GitLab <cki-project@redhat.com> [5.8.0-0.rc0.20200602gitf359287765c0.1]
-- f359287765c0 rebase
+* Wed Jun 03 2020 CKI@GitLab <cki-project@redhat.com> [5.8.0-0.rc0.20200603gitd6f9469a03d8.1]
+- d6f9469a03d8 rebase
+- Fix configs for Fedora ("Justin M. Forbes")
 - Fix update_scripts.sh unselective pattern sub (David Howells)
 - Updated changelog for the release based on b0c3ba31be3e ("CKI@GitLab")
 - Drop the static path configuration for the Sphinx docs (Jeremy Cline)
diff --git a/sources b/sources
index 889f6ee16..e218a4a73 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20200603gitf359287765c0.tar.xz) = 316ad1162ecbf5cbe8df8f228f95aef2712bb105b6f963b371fde1c544fa564544a49e8f1674ce5e23a966bbcb602cbe998a1a5196fa779d08c8681d2269047c
-SHA512 (kernel-abi-whitelists-5.8.0-0.rc0.20200603gitf359287765c0.1.tar.bz2) = aea552394c988877ad013530489815482dee6c73c253c1dfc92356f0721def709d87f86337ac79f99d31ef761128a5545820575dc129b2fdf283818825d9cc32
-SHA512 (kernel-kabi-dw-5.8.0-0.rc0.20200603gitf359287765c0.1.tar.bz2) = 86527d03093b374695372d816a7a01fe7f97b98afdeb480bc24d7a026b75cae8242e568d1fa7691cfe9a2de23a2431f91c578a841b095067f582bf3d78fd7cf4
+SHA512 (linux-20200603gitd6f9469a03d8.tar.xz) = 2804cad61d995d472dd3fad379d0e54b92dadbb0ff1c4a853b124f5c8af0a7ec241b407337c911647a9ef54a57d1f85263f4f6a86828e13e941fbcd4b0704530
+SHA512 (kernel-abi-whitelists-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.tar.bz2) = 5c8204c6996d1140f3584629445f67194620864574a818cfa1c9f3cc3670bb5e9057532c9bdc812bd430cc501e9944e7e1b73d1e69125510bdec7ff835bf34cd
+SHA512 (kernel-kabi-dw-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.tar.bz2) = c164cbfe0132fbdaff33797cf1d9b31ea4b9f5da807d66855aa83bc29599434d7d381e624c25f6fae5ca1158026f5f2f6ff84c8b54e5ddb3de65d9be36db8f8a