Update to 5.15.18

2022-02-07 08:12:40 +00:00 · 2022-02-07 08:12:40 +00:00 · 08fca0a8f5
commit 08fca0a8f5
parent 89a396a5fc
18 changed files with 321 additions and 304 deletions
--- a/.kernel.metadata
+++ b/.kernel.metadata
@ -1,2 +1,2 @@
 ac61f2459040c09af1d5abd4ed100c3d316b443e  SOURCES/linux-5.15.tar.xz
-7646d3f0baf87f0a843c3d9055b02d9b6b146706  SOURCES/patch-5.15.10.xz
+89f83b4ff3e18efb5acacac94ff230f893915920  SOURCES/patch-5.15.18.xz
--- a/SOURCES/0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch
+++ b/SOURCES/0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch
@ -48,15 +48,15 @@ diff --git a/kernel/crash_core.c b/kernel/crash_core.c
 index 18175687133a..e4dfe2a05a31 100644
 --- a/kernel/crash_core.c
 +++ b/kernel/crash_core.c
-@@ -7,6 +7,7 @@
- #include <linux/crash_core.h>
+@@ -9,6 +9,7 @@
+ #include <linux/init.h>
 #include <linux/utsname.h>
 #include <linux/vmalloc.h>
 +#include <linux/sizes.h>
 
 #include <asm/page.h>
 #include <asm/sections.h>
-@@ -39,6 +40,15 @@ static int __init parse_crashkernel_mem(char *cmdline,
+@@ -43,6 +44,15 @@ static int __init parse_crashkernel_mem(char *cmdline,
 					unsigned long long *crash_base)
 {
 	char *cur = cmdline, *tmp;
@ -72,7 +72,7 @@ index 18175687133a..e4dfe2a05a31 100644
 
 	/* for each entry of the comma-separated list */
 	do {
-@@ -83,13 +93,13 @@ static int __init parse_crashkernel_mem(char *cmdline,
+@@ -87,13 +97,13 @@ static int __init parse_crashkernel_mem(char *cmdline,
 			return -EINVAL;
 		}
 		cur = tmp;
--- a/SOURCES/fedora-v5.15.patch
+++ b/SOURCES/fedora-v5.15.patch
@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Tue, 27 Feb 2018 00:21:23 -0500
-Subject: [PATCH 01/33] ACPI: APEI: arm64: Ignore broken HPE moonshot APEI
+Subject: [PATCH 01/35] ACPI: APEI: arm64: Ignore broken HPE moonshot APEI
 support

 Message-id: <20180227002123.21608-1-ahs3@redhat.com>
@ -74,7 +74,7 @@ index 277f00b288d1..adbce15c273d 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Salter <msalter@redhat.com>
 Date: Thu, 10 May 2018 17:38:43 -0400
-Subject: [PATCH 02/33] ACPI / irq: Workaround firmware issue on X-Gene based
+Subject: [PATCH 02/35] ACPI / irq: Workaround firmware issue on X-Gene based
 m400

 Message-id: <20180510173844.29580-3-msalter@redhat.com>
@ -151,7 +151,7 @@ index c68e694fca26..146cba5ae5bc 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Salter <msalter@redhat.com>
 Date: Thu, 10 May 2018 17:38:44 -0400
-Subject: [PATCH 03/33] aarch64: acpi scan: Fix regression related to X-Gene
+Subject: [PATCH 03/35] aarch64: acpi scan: Fix regression related to X-Gene
 UARTs

 Message-id: <20180510173844.29580-4-msalter@redhat.com>
@ -179,11 +179,11 @@ 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 5b54c80b9d32..86c314f8d8a0 100644
+index 6e9cd41c5f9b..07db2f6afa17 100644
 --- a/drivers/acpi/scan.c
 +++ b/drivers/acpi/scan.c
-@@ -1720,6 +1720,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
- 	if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids))
+@@ -1727,6 +1727,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
+ 	if (!acpi_match_device_ids(device, ignore_serial_bus_ids))
 		return false;
 
 +	/*
@ -205,7 +205,7 @@ index 5b54c80b9d32..86c314f8d8a0 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Salter <msalter@redhat.com>
 Date: Fri, 11 May 2018 21:01:17 -0400
-Subject: [PATCH 04/33] acpi: prefer booting with ACPI over DTS
+Subject: [PATCH 04/35] acpi: prefer booting with ACPI over DTS

 Message-id: <20180511210117.10457-1-msalter@redhat.com>
 Patchwork-id: 214708
@ -262,7 +262,7 @@ index f3851724fe35..cac21da49455 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Robert Richter <rrichter@redhat.com>
 Date: Thu, 7 Jun 2018 22:59:32 -0400
-Subject: [PATCH 05/33] Vulcan: AHCI PCI bar fix for Broadcom Vulcan early
+Subject: [PATCH 05/35] Vulcan: AHCI PCI bar fix for Broadcom Vulcan early
 silicon

 Message-id: <1528412373-19128-2-git-send-email-rrichter@redhat.com>
@ -298,10 +298,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
 1 file changed, 24 insertions(+)

 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 208fa03acdda..88cfaa8ac3b3 100644
+index 0663762ea69d..3f1215e8c5b2 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -4269,6 +4269,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
+@@ -4272,6 +4272,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084,
 				quirk_bridge_cavm_thrx2_pcie_root);
 
@ -339,7 +339,7 @@ index 208fa03acdda..88cfaa8ac3b3 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Robert Richter <rrichter@redhat.com>
 Date: Thu, 7 Jun 2018 22:59:33 -0400
-Subject: [PATCH 06/33] ahci: thunderx2: Fix for errata that affects stop
+Subject: [PATCH 06/35] ahci: thunderx2: Fix for errata that affects stop
 engine

 Message-id: <1528412373-19128-3-git-send-email-rrichter@redhat.com>
@ -430,7 +430,7 @@ index 395772fa3943..35aa1b420262 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Laura Abbott <labbott@redhat.com>
 Date: Sun, 10 Feb 2019 01:27:54 +0000
-Subject: [PATCH 07/33] ipmi: do not configure ipmi for HPE m400
+Subject: [PATCH 07/35] ipmi: do not configure ipmi for HPE m400

 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1670017
 Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=20147017
@ -513,7 +513,7 @@ index bbf7029e224b..cf7faa970dd6 100644
 		dmi_decode_ipmi((const struct dmi_header *) dev->device_data);
 
 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
-index b404cc46cbda..c74d611bcb79 100644
+index fe91090e04a4..f00bc6886913 100644
 --- a/drivers/char/ipmi/ipmi_msghandler.c
 +++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -35,6 +35,7 @@
@ -524,7 +524,7 @@ index b404cc46cbda..c74d611bcb79 100644
 #include <linux/delay.h>
 
 #define IPMI_DRIVER_VERSION "39.2"
-@@ -5173,8 +5174,21 @@ static int __init ipmi_init_msghandler_mod(void)
+@@ -5178,8 +5179,21 @@ static int __init ipmi_init_msghandler_mod(void)
 {
 	int rv;
 
@ -554,7 +554,7 @@ index b404cc46cbda..c74d611bcb79 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Laura Abbott <labbott@redhat.com>
 Date: Mon, 20 May 2019 22:21:02 -0400
-Subject: [PATCH 08/33] iommu/arm-smmu: workaround DMA mode issues
+Subject: [PATCH 08/35] iommu/arm-smmu: workaround DMA mode issues

 Message-id: <20190520222102.19488-1-labbott@redhat.com>
 Patchwork-id: 259215
@ -610,7 +610,7 @@ Signed-off-by: Laura Abbott <labbott@redhat.com>
 1 file changed, 22 insertions(+)

 diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
-index 3303d707bab4..372edaaafaa1 100644
+index f62fb6a58f10..26ade573cec9 100644
 --- a/drivers/iommu/iommu.c
 +++ b/drivers/iommu/iommu.c
@@ -7,6 +7,7 @@
@ -621,7 +621,7 @@ index 3303d707bab4..372edaaafaa1 100644
 #include <linux/dma-iommu.h>
 #include <linux/kernel.h>
 #include <linux/bits.h>
-@@ -3118,6 +3119,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle)
+@@ -3119,6 +3120,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle)
 }
 EXPORT_SYMBOL_GPL(iommu_sva_get_pasid);
 
@ -656,7 +656,7 @@ index 3303d707bab4..372edaaafaa1 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Cline <jcline@redhat.com>
 Date: Tue, 1 Oct 2019 15:51:23 +0000
-Subject: [PATCH 09/33] arm: aarch64: Drop the EXPERT setting from
+Subject: [PATCH 09/35] arm: aarch64: Drop the EXPERT setting from
 ARM64_FORCE_52BIT

 Message-id: <20191001181256.22935-1-jcline@redhat.com>
@ -677,7 +677,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index fee914c716aa..c987f305f429 100644
+index 0758ea0717f9..713f41c74024 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
@@ -911,7 +911,7 @@ endchoice
@ -696,7 +696,7 @@ index fee914c716aa..c987f305f429 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 2 Oct 2017 18:22:13 -0400
-Subject: [PATCH 10/33] Add efi_status_to_str() and rework efi_status_to_err().
+Subject: [PATCH 10/35] Add efi_status_to_str() and rework efi_status_to_err().

 This adds efi_status_to_str() for use when printing efi_status_t
 messages, and reworks efi_status_to_err() so that the two use a common
@ -855,7 +855,7 @@ index 847f33ffc4ae..363037f8eaf8 100644
 
 static DEFINE_SPINLOCK(efi_mem_reserve_persistent_lock);
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 6b5d36babfcc..cbac8a7db3bd 100644
+index 3d8ddc5eca8c..7aad9fc10338 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
@@ -43,6 +43,8 @@
@ -882,7 +882,7 @@ index 6b5d36babfcc..cbac8a7db3bd 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones@redhat.com>
 Date: Mon, 2 Oct 2017 18:18:30 -0400
-Subject: [PATCH 11/33] Make get_cert_list() use efi_status_to_str() to print
+Subject: [PATCH 11/35] Make get_cert_list() use efi_status_to_str() to print
 error messages.

 Upstream Status: RHEL only
@ -923,7 +923,7 @@ index f290f78c3f30..d3e7ae04f5be 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Cline <jcline@redhat.com>
 Date: Mon, 30 Sep 2019 21:22:47 +0000
-Subject: [PATCH 12/33] security: lockdown: expose a hook to lock the kernel
+Subject: [PATCH 12/35] security: lockdown: expose a hook to lock the kernel
 down

 In order to automatically lock down kernels running on UEFI machines
@ -1028,7 +1028,7 @@ index 67264cb08fb3..85a0227bfac1 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Tue, 27 Feb 2018 10:04:55 +0000
-Subject: [PATCH 13/33] efi: Add an EFI_SECURE_BOOT flag to indicate secure
+Subject: [PATCH 13/35] efi: Add an EFI_SECURE_BOOT flag to indicate secure
 boot mode

 UEFI machines can be booted in Secure Boot mode.  Add an EFI_SECURE_BOOT
@ -1054,10 +1054,10 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
 create mode 100644 drivers/firmware/efi/secureboot.c

 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index d71267081153..da9c2e03a179 100644
+index 48596f9fddf4..a34abc4ce94f 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
-@@ -1106,19 +1106,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1094,19 +1094,7 @@ void __init setup_arch(char **cmdline_p)
 	/* Allocate bigger log buffer */
 	setup_log_buf(1);
 
@ -1135,7 +1135,7 @@ index 000000000000..de0a3714a5d4
 +	}
 +}
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index cbac8a7db3bd..fd4a5d66a9d0 100644
+index 7aad9fc10338..779f41901f35 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
@@ -784,6 +784,14 @@ extern int __init efi_setup_pcdp_console(char *);
@ -1192,7 +1192,7 @@ index cbac8a7db3bd..fd4a5d66a9d0 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: David Howells <dhowells@redhat.com>
 Date: Mon, 30 Sep 2019 21:28:16 +0000
-Subject: [PATCH 14/33] efi: Lock down the kernel if booted in secure boot mode
+Subject: [PATCH 14/35] efi: Lock down the kernel if booted in secure boot mode

 UEFI Secure Boot provides a mechanism for ensuring that the firmware
 will only load signed bootloaders and kernels.  Certain use cases may
@ -1209,7 +1209,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
 2 files changed, 21 insertions(+)

 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index da9c2e03a179..5f7b1c67ddcc 100644
+index a34abc4ce94f..b31d4f581b66 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
@@ -20,6 +20,7 @@
@ -1220,7 +1220,7 @@ index da9c2e03a179..5f7b1c67ddcc 100644
 #include <linux/usb/xhci-dbgp.h>
 #include <linux/static_call.h>
 #include <linux/swiotlb.h>
-@@ -941,6 +942,13 @@ void __init setup_arch(char **cmdline_p)
+@@ -929,6 +930,13 @@ void __init setup_arch(char **cmdline_p)
 	if (efi_enabled(EFI_BOOT))
 		efi_init();
 
@ -1265,7 +1265,7 @@ index e84ddf484010..d0501353a4b9 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Cline <jcline@redhat.com>
 Date: Wed, 30 Oct 2019 14:37:49 +0000
-Subject: [PATCH 15/33] s390: Lock down the kernel when the IPL secure flag is
+Subject: [PATCH 15/35] s390: Lock down the kernel when the IPL secure flag is
 set

 Automatically lock down the kernel to LOCKDOWN_CONFIDENTIALITY_MAX if
@ -1334,7 +1334,7 @@ index ee67215a678a..931955a9ceca 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
 Date: Wed, 26 Feb 2020 13:38:40 -0500
-Subject: [PATCH 16/33] Add option of 13 for FORCE_MAX_ZONEORDER
+Subject: [PATCH 16/35] Add option of 13 for FORCE_MAX_ZONEORDER

 This is a hack, but it's what the other distros currently use
 for aarch64 with 4K pages so we'll do the same while upstream
@ -1349,7 +1349,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
 1 file changed, 1 insertion(+)

 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index c987f305f429..e14e8636574e 100644
+index 713f41c74024..5be7713a5ca0 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
@@ -1152,6 +1152,7 @@ config XEN
@ -1367,7 +1367,7 @@ index c987f305f429..e14e8636574e 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Salter <msalter@redhat.com>
 Date: Thu, 26 Aug 2021 10:59:23 -0400
-Subject: [PATCH 17/33] arm64: use common CONFIG_MAX_ZONEORDER for arm kernel
+Subject: [PATCH 17/35] arm64: use common CONFIG_MAX_ZONEORDER for arm kernel

 Now that RHEL9 is using 4K pagesize, MAX_ZONEORDER is defaulting
 to 11. Fedora uses an out of tree patch to default to 13 when
@ -1381,7 +1381,7 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index e14e8636574e..99bb34aac703 100644
+index 5be7713a5ca0..fb57b7a992d4 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
@@ -1152,7 +1152,7 @@ config XEN
@ -1400,7 +1400,7 @@ index e14e8636574e..99bb34aac703 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jon Masters <jcm@redhat.com>
 Date: Thu, 18 Jul 2019 15:47:26 -0400
-Subject: [PATCH 18/33] arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT
+Subject: [PATCH 18/35] arm: make CONFIG_HIGHPTE optional without CONFIG_EXPERT

 We will use this to force CONFIG_HIGHPTE off on LPAE for now

@ -1432,7 +1432,7 @@ index 4ebd512043be..6743668b7b33 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
 Date: Thu, 3 May 2012 20:27:11 +0100
-Subject: [PATCH 19/33] ARM: tegra: usb no reset
+Subject: [PATCH 19/35] ARM: tegra: usb no reset

 Patch for disconnect issues with storage attached to a
 tegra-ehci controller
@ -1441,10 +1441,10 @@ Patch for disconnect issues with storage attached to a
 1 file changed, 7 insertions(+)

 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 00070a8a6507..e9e0ffa990cd 100644
+index ac6c5ccfe1cb..ec784479eece 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5666,6 +5666,13 @@ static void hub_event(struct work_struct *work)
+@@ -5669,6 +5669,13 @@ static void hub_event(struct work_struct *work)
 			(u16) hub->change_bits[0],
 			(u16) hub->event_bits[0]);
 
@ -1465,7 +1465,7 @@ index 00070a8a6507..e9e0ffa990cd 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
 Date: Mon, 3 Apr 2017 18:18:21 +0200
-Subject: [PATCH 20/33] Input: rmi4 - remove the need for artificial IRQ in
+Subject: [PATCH 20/35] Input: rmi4 - remove the need for artificial IRQ in
 case of HID

 The IRQ from rmi4 may interfere with the one we currently use on i2c-hid.
@ -1796,7 +1796,7 @@ index ab7eea01ab42..fff7c5f737fc 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Robert Holmes <robeholmes@gmail.com>
 Date: Tue, 23 Apr 2019 07:39:29 +0000
-Subject: [PATCH 21/33] KEYS: Make use of platform keyring for module signature
+Subject: [PATCH 21/35] KEYS: Make use of platform keyring for module signature
 verify

 This patch completes commit 278311e417be ("kexec, KEYS: Make use of
@ -1841,7 +1841,7 @@ index 8723ae70ea1f..fb2d773498c2 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Linton <jeremy.linton@arm.com>
 Date: Thu, 11 Mar 2021 22:15:13 -0600
-Subject: [PATCH 22/33] REDHAT: coresight: etm4x: Disable coresight on HPE
+Subject: [PATCH 22/35] REDHAT: coresight: etm4x: Disable coresight on HPE
 Apollo 70

 bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1918888
@ -1916,7 +1916,7 @@ index e24252eaf8e4..368d64adeee8 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mike Snitzer <snitzer@redhat.com>
 Date: Tue, 13 Apr 2021 13:09:36 -0400
-Subject: [PATCH 23/33] nvme: Return BLK_STS_TARGET if the DNR bit is set
+Subject: [PATCH 23/35] nvme: Return BLK_STS_TARGET if the DNR bit is set

 BZ: 1948690
 Upstream Status: RHEL-only
@ -1983,7 +1983,7 @@ index f8dd664b2eda..8c2d88526b1d 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mike Snitzer <snitzer@redhat.com>
 Date: Tue, 13 Apr 2021 13:09:36 -0400
-Subject: [PATCH 24/33] nvme: allow local retry and proper failover for
+Subject: [PATCH 24/35] nvme: allow local retry and proper failover for
 REQ_FAILFAST_TRANSPORT

 BZ: 1948690
@ -2079,7 +2079,7 @@ index 8c2d88526b1d..f68e6d796be1 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mike Snitzer <snitzer@redhat.com>
 Date: Tue, 13 Apr 2021 13:09:37 -0400
-Subject: [PATCH 25/33] nvme: decouple basic ANA log page re-read support from
+Subject: [PATCH 25/35] nvme: decouple basic ANA log page re-read support from
 native multipathing

 BZ: 1948690
@ -2196,7 +2196,7 @@ index ed79a6c7e804..961dc67d7261 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mike Snitzer <snitzer@redhat.com>
 Date: Tue, 25 May 2021 12:36:06 -0400
-Subject: [PATCH 26/33] nvme: nvme_mpath_init remove multipath check
+Subject: [PATCH 26/35] nvme: nvme_mpath_init remove multipath check

 BZ: 1948690
 Upstream Status: RHEL-only
@ -2260,7 +2260,7 @@ index 4c7d12e2fe70..021a4176b321 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Herbert Xu <herbert.xu@redhat.com>
 Date: Tue, 10 Aug 2021 17:54:28 +0800
-Subject: [PATCH 27/33] random: Add hook to override device reads and
+Subject: [PATCH 27/35] random: Add hook to override device reads and
 getrandom(2)

 Upstream: RHEL only
@ -2280,7 +2280,7 @@ Signed-off-by: Herbert Xu <herbert.xu@redhat.com>
 2 files changed, 122 insertions(+)

 diff --git a/drivers/char/random.c b/drivers/char/random.c
-index 605969ed0f96..4d51f1c67675 100644
+index a27ae3999ff3..dc4e136adb08 100644
 --- a/drivers/char/random.c
 +++ b/drivers/char/random.c
@@ -335,6 +335,7 @@
@ -2303,7 +2303,7 @@ index 605969ed0f96..4d51f1c67675 100644
 /*
  * Configuration information
  */
-@@ -481,6 +487,9 @@ static int ratelimit_disable __read_mostly;
+@@ -482,6 +488,9 @@ static int ratelimit_disable __read_mostly;
 module_param_named(ratelimit_disable, ratelimit_disable, int, 0644);
 MODULE_PARM_DESC(ratelimit_disable, "Disable random ratelimit suppression");
 
@ -2313,7 +2313,7 @@ index 605969ed0f96..4d51f1c67675 100644
 /**********************************************************************
  *
  * OS independent entropy store.   Here are the functions which handle
-@@ -1858,6 +1867,13 @@ random_poll(struct file *file, poll_table * wait)
+@@ -1880,6 +1889,13 @@ random_poll(struct file *file, poll_table * wait)
 	return mask;
 }
 
@ -2327,7 +2327,7 @@ index 605969ed0f96..4d51f1c67675 100644
 static int
 write_pool(struct entropy_store *r, const char __user *buffer, size_t count)
 {
-@@ -1961,7 +1977,58 @@ static int random_fasync(int fd, struct file *filp, int on)
+@@ -1983,7 +1999,58 @@ static int random_fasync(int fd, struct file *filp, int on)
 	return fasync_helper(fd, filp, on, &fasync);
 }
 
@ -2386,7 +2386,7 @@ index 605969ed0f96..4d51f1c67675 100644
 	.read  = random_read,
 	.write = random_write,
 	.poll  = random_poll,
-@@ -1972,6 +2039,7 @@ const struct file_operations random_fops = {
+@@ -1994,6 +2061,7 @@ const struct file_operations random_fops = {
 };
 
 const struct file_operations urandom_fops = {
@ -2394,7 +2394,7 @@ index 605969ed0f96..4d51f1c67675 100644
 	.read  = urandom_read,
 	.write = random_write,
 	.unlocked_ioctl = random_ioctl,
-@@ -1980,9 +2048,31 @@ const struct file_operations urandom_fops = {
+@@ -2002,9 +2070,31 @@ const struct file_operations urandom_fops = {
 	.llseek = noop_llseek,
 };
 
@ -2426,7 +2426,7 @@ index 605969ed0f96..4d51f1c67675 100644
 	int ret;
 
 	if (flags & ~(GRND_NONBLOCK|GRND_RANDOM|GRND_INSECURE))
-@@ -1998,6 +2088,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count,
+@@ -2020,6 +2110,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count,
 	if (count > INT_MAX)
 		count = INT_MAX;
 
@ -2445,7 +2445,7 @@ index 605969ed0f96..4d51f1c67675 100644
 	if (!(flags & GRND_INSECURE) && !crng_ready()) {
 		if (flags & GRND_NONBLOCK)
 			return -EAGAIN;
-@@ -2303,3 +2405,16 @@ void add_bootloader_randomness(const void *buf, unsigned int size)
+@@ -2329,3 +2431,16 @@ void add_bootloader_randomness(const void *buf, unsigned int size)
 		add_device_randomness(buf, size);
 }
 EXPORT_SYMBOL_GPL(add_bootloader_randomness);
@ -2494,7 +2494,7 @@ index f45b8be3e3c4..7ccdec68b789 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Herbert Xu <herbert.xu@redhat.com>
 Date: Tue, 10 Aug 2021 17:56:42 +0800
-Subject: [PATCH 28/33] crypto: rng - Override drivers/char/random in FIPS mode
+Subject: [PATCH 28/35] crypto: rng - Override drivers/char/random in FIPS mode

 Upstream: RHEL only
 Bugzilla: 1984784
@ -2611,7 +2611,7 @@ index fea082b25fe4..50a9d040bed1 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Dan Johansen <strit@manjaro.org>
 Date: Fri, 6 Aug 2021 00:04:27 +0200
-Subject: [PATCH 29/33] arm64: dts: rockchip: Setup USB typec port as datarole
+Subject: [PATCH 29/35] arm64: dts: rockchip: Setup USB typec port as datarole
 on

 Some chargers try to put the charged device into device data
@ -2643,7 +2643,7 @@ index 9e5d07f5712e..dae8c252bc2b 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Thu, 14 Oct 2021 20:39:42 +0200
-Subject: [PATCH 30/33] x86/PCI: Ignore E820 reservations for bridge windows on
+Subject: [PATCH 30/35] x86/PCI: Ignore E820 reservations for bridge windows on
 newer systems
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@ -2729,10 +2729,10 @@ Acked-by: Bjorn Helgaas <bhelgaas@google.com>
 5 files changed, 57 insertions(+)

 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 1396fd2d9031..4bc97128cee8 100644
+index 8ff6dafafdf8..e3f786336cf9 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -3949,6 +3949,15 @@
+@@ -3955,6 +3955,15 @@
 				please report a bug.
 		nocrs		[X86] Ignore PCI host bridge windows from ACPI.
 				If you need to use this, please report a bug.
@ -2872,7 +2872,7 @@ index 3507f456fcd0..091ec7e94fcb 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Thu, 14 Oct 2021 20:39:43 +0200
-Subject: [PATCH 31/33] x86/PCI/ACPI: Replace printk calls with pr_info/pr_warn
+Subject: [PATCH 31/35] x86/PCI/ACPI: Replace printk calls with pr_info/pr_warn
 calls

 The direct use of printk is deprecated, replace the printk calls
@ -2964,73 +2964,10 @@ index 72d473054262..f357dac92610 100644
 2.31.1


-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zekun Shen <bruceshenzk@gmail.com>
-Date: Sat, 30 Oct 2021 22:42:50 -0400
-Subject: [PATCH 32/33] mwifiex_usb: Fix skb_over_panic in mwifiex_usb_recv
-
-Currently, with an unknown recv_type, mwifiex_usb_recv
-just return -1 without restoring the skb. Next time
-mwifiex_usb_rx_complete is invoked with the same skb,
-calling skb_put causes skb_over_panic.
-
-The bug is triggerable with a compromised/malfunctioning
-usb device. After applying the patch, skb_over_panic
-no longer shows up with the same input.
-
-Attached is the panic report from fuzzing.
-skbuff: skb_over_panic: text:000000003bf1b5fa
- len:2048 put:4 head:00000000dd6a115b data:000000000a9445d8
- tail:0x844 end:0x840 dev:<NULL>
-kernel BUG at net/core/skbuff.c:109!
-invalid opcode: 0000 [#1] SMP KASAN NOPTI
-CPU: 0 PID: 198 Comm: in:imklog Not tainted 5.6.0 #60
-RIP: 0010:skb_panic+0x15f/0x161
-Call Trace:
- <IRQ>
- ? mwifiex_usb_rx_complete+0x26b/0xfcd [mwifiex_usb]
- skb_put.cold+0x24/0x24
- mwifiex_usb_rx_complete+0x26b/0xfcd [mwifiex_usb]
- __usb_hcd_giveback_urb+0x1e4/0x380
- usb_giveback_urb_bh+0x241/0x4f0
- ? __hrtimer_run_queues+0x316/0x740
- ? __usb_hcd_giveback_urb+0x380/0x380
- tasklet_action_common.isra.0+0x135/0x330
- __do_softirq+0x18c/0x634
- irq_exit+0x114/0x140
- smp_apic_timer_interrupt+0xde/0x380
- apic_timer_interrupt+0xf/0x20
- </IRQ>
-
-Reported-by: Zekun Shen <bruceshenzk@gmail.com>
-Reported-by: Brendan Dolan-Gavitt <brendandg@nyu.edu>
-Signed-off-by: Zekun Shen <bruceshenzk@gmail.com>
---
- drivers/net/wireless/marvell/mwifiex/usb.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c
-index 9736aa0ab7fd..8f01fcbe9396 100644
--- a/drivers/net/wireless/marvell/mwifiex/usb.c
-+++ b/drivers/net/wireless/marvell/mwifiex/usb.c
-@@ -130,7 +130,8 @@ static int mwifiex_usb_recv(struct mwifiex_adapter *adapter,
- 		default:
- 			mwifiex_dbg(adapter, ERROR,
- 				    "unknown recv_type %#x\n", recv_type);
-			return -1;
-+			ret = -1;
-+			goto exit_restore_skb;
- 		}
- 		break;
- 	case MWIFIEX_USB_EP_DATA:
-- 
-2.31.1
-
-
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Tue, 23 Nov 2021 22:05:24 +0100
-Subject: [PATCH 33/33] platform/x86: thinkpad_acpi: Add lid_logo_dot to the
+Subject: [PATCH 32/35] platform/x86: thinkpad_acpi: Add lid_logo_dot to the
 list of safe LEDs

 There have been various bugs / forum threads about allowing control of
@ -3071,3 +3008,234 @@ index 3dc055ce6e61..bb56640eb31f 100644
 -- 
 2.31.1

+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Florian Westphal <fw@strlen.de>
+Date: Fri, 17 Dec 2021 11:29:56 +0100
+Subject: [PATCH 33/35] netfilter: conntrack: tag conntracks picked up in local
+ out hook
+
+This allows to identify flows that originate from local machine
+in a followup patch.
+
+It would be possible to make this a ->status bit instead.
+For now I did not do that yet because I don't have a use-case for
+exposing this info to userspace.
+
+If one comes up the toggle can be replaced with a status bit.
+
+Signed-off-by: Florian Westphal <fw@strlen.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ include/net/netfilter/nf_conntrack.h | 1 +
+ net/netfilter/nf_conntrack_core.c    | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
+index d24b0a34c8f0..871489df63c6 100644
+--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
+@@ -95,6 +95,7 @@ struct nf_conn {
+ 	unsigned long status;
+ 
+ 	u16		cpu;
+	u16		local_origin:1;
+ 	possible_net_t ct_net;
+ 
+ #if IS_ENABLED(CONFIG_NF_NAT)
+diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
+index 4712a90a1820..208abc729302 100644
+--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
+@@ -1749,6 +1749,9 @@ resolve_normal_ct(struct nf_conn *tmpl,
+ 			return 0;
+ 		if (IS_ERR(h))
+ 			return PTR_ERR(h);
+
+		ct = nf_ct_tuplehash_to_ctrack(h);
+		ct->local_origin = state->hook == NF_INET_LOCAL_OUT;
+ 	}
+ 	ct = nf_ct_tuplehash_to_ctrack(h);
+ 
+-- 
+2.31.1
+
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Florian Westphal <fw@strlen.de>
+Date: Fri, 17 Dec 2021 11:29:57 +0100
+Subject: [PATCH 34/35] netfilter: nat: force port remap to prevent shadowing
+ well-known ports
+
+If destination port is above 32k and source port below 16k
+assume this might cause 'port shadowing' where a 'new' inbound
+connection matches an existing one, e.g.
+
+inbound X:41234 -> Y:53 matches existing conntrack entry
+        Z:53 -> X:4123, where Z got natted to X.
+
+In this case, new packet is natted to Z:53 which is likely
+unwanted.
+
+We avoid the rewrite for connections that originate from local host:
+port-shadowing is only possible with forwarded connections.
+
+Also adjust test case.
+
+v3: no need to call tuple_force_port_remap if already in random mode (Phil)
+
+Signed-off-by: Florian Westphal <fw@strlen.de>
+Acked-by: Phil Sutter <phil@nwl.cc>
+Acked-by: Eric Garver <eric@garver.life>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ net/netfilter/nf_nat_core.c                  | 43 ++++++++++++++++++--
+ tools/testing/selftests/netfilter/nft_nat.sh |  5 ++-
+ 2 files changed, 43 insertions(+), 5 deletions(-)
+
+diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
+index 273117683922..21ec0c3d1d47 100644
+--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
+@@ -494,6 +494,38 @@ static void nf_nat_l4proto_unique_tuple(struct nf_conntrack_tuple *tuple,
+ 	goto another_round;
+ }
+ 
+static bool tuple_force_port_remap(const struct nf_conntrack_tuple *tuple)
+{
+	u16 sp, dp;
+
+	switch (tuple->dst.protonum) {
+	case IPPROTO_TCP:
+		sp = ntohs(tuple->src.u.tcp.port);
+		dp = ntohs(tuple->dst.u.tcp.port);
+		break;
+	case IPPROTO_UDP:
+	case IPPROTO_UDPLITE:
+		sp = ntohs(tuple->src.u.udp.port);
+		dp = ntohs(tuple->dst.u.udp.port);
+		break;
+	default:
+		return false;
+	}
+
+	/* IANA: System port range: 1-1023,
+	 *         user port range: 1024-49151,
+	 *      private port range: 49152-65535.
+	 *
+	 * Linux default ephemeral port range is 32768-60999.
+	 *
+	 * Enforce port remapping if sport is significantly lower
+	 * than dport to prevent NAT port shadowing, i.e.
+	 * accidental match of 'new' inbound connection vs.
+	 * existing outbound one.
+	 */
+	return sp < 16384 && dp >= 32768;
+}
+
+ /* Manipulate the tuple into the range given. For NF_INET_POST_ROUTING,
+  * we change the source to map into the range. For NF_INET_PRE_ROUTING
+  * and NF_INET_LOCAL_OUT, we change the destination to map into the
+@@ -507,11 +539,17 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple,
+ 		 struct nf_conn *ct,
+ 		 enum nf_nat_manip_type maniptype)
+ {
+	bool random_port = range->flags & NF_NAT_RANGE_PROTO_RANDOM_ALL;
+ 	const struct nf_conntrack_zone *zone;
+ 	struct net *net = nf_ct_net(ct);
+ 
+ 	zone = nf_ct_zone(ct);
+ 
+	if (maniptype == NF_NAT_MANIP_SRC &&
+	    !random_port &&
+	    !ct->local_origin)
+		random_port = tuple_force_port_remap(orig_tuple);
+
+ 	/* 1) If this srcip/proto/src-proto-part is currently mapped,
+ 	 * and that same mapping gives a unique tuple within the given
+ 	 * range, use that.
+@@ -520,8 +558,7 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple,
+ 	 * So far, we don't do local source mappings, so multiple
+ 	 * manips not an issue.
+ 	 */
+-	if (maniptype == NF_NAT_MANIP_SRC &&
+-	    !(range->flags & NF_NAT_RANGE_PROTO_RANDOM_ALL)) {
+	if (maniptype == NF_NAT_MANIP_SRC && !random_port) {
+ 		/* try the original tuple first */
+ 		if (in_range(orig_tuple, range)) {
+ 			if (!nf_nat_used_tuple(orig_tuple, ct)) {
+@@ -545,7 +582,7 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple,
+ 	 */
+ 
+ 	/* Only bother mapping if it's not already in range and unique */
+-	if (!(range->flags & NF_NAT_RANGE_PROTO_RANDOM_ALL)) {
+	if (!random_port) {
+ 		if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED) {
+ 			if (!(range->flags & NF_NAT_RANGE_PROTO_OFFSET) &&
+ 			    l4proto_in_range(tuple, maniptype,
+diff --git a/tools/testing/selftests/netfilter/nft_nat.sh b/tools/testing/selftests/netfilter/nft_nat.sh
+index da1c1e4b6c86..6a08644d501e 100755
+--- a/tools/testing/selftests/netfilter/nft_nat.sh
+++ b/tools/testing/selftests/netfilter/nft_nat.sh
+@@ -867,8 +867,9 @@ EOF
+ 		return $ksft_skip
+ 	fi
+ 
+-	# test default behaviour. Packet from ns1 to ns0 is redirected to ns2.
+-	test_port_shadow "default" "CLIENT"
+	# test default behaviour. Packet from ns1 to ns0 is not redirected
+	# due to automatic port translation.
+	test_port_shadow "default" "ROUTER"
+ 
+ 	# test packet filter based mitigation: prevent forwarding of
+ 	# packets claiming to come from the service port.
+-- 
+2.31.1
+
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Justin M. Forbes" <jforbes@fedoraproject.org>
+Date: Tue, 25 Jan 2022 09:08:34 -0600
+Subject: [PATCH 35/35] Revert "PCI/MSI: Mask MSI-X vectors only on success"
+
+This reverts commit d8888cdabedf353ab9b5a6af75f70bf341a3e7df.
+
+Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
+---
+ drivers/pci/msi.c | 13 +++----------
+ 1 file changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
+index cc4c2b8a5efd..96132d68be1e 100644
+--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
+@@ -721,6 +721,9 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
+ 		goto out_disable;
+ 	}
+ 
+	/* Ensure that all table entries are masked. */
+	msix_mask_all(base, tsize);
+
+ 	ret = msix_setup_entries(dev, base, entries, nvec, affd);
+ 	if (ret)
+ 		goto out_disable;
+@@ -747,16 +750,6 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
+ 	/* Set MSI-X enabled bits and unmask the function */
+ 	pci_intx_for_msi(dev, 0);
+ 	dev->msix_enabled = 1;
+-
+-	/*
+-	 * Ensure that all table entries are masked to prevent
+-	 * stale entries from firing in a crash kernel.
+-	 *
+-	 * Done late to deal with a broken Marvell NVME device
+-	 * which takes the MSI-X mask bits into account even
+-	 * when MSI-X is disabled, which prevents MSI delivery.
+-	 */
+-	msix_mask_all(base, tsize);
+ 	pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL, 0);
+ 
+ 	pcibios_free_irq(dev);
+-- 
+2.31.1
+
--- a/SOURCES/kernel-aarch64-debug-fedora.config
+++ b/SOURCES/kernel-aarch64-debug-fedora.config
@ -4733,7 +4733,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NFC_PN532_UART is not set
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@ -6823,16 +6823,11 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_AMD_ACP3x is not set
 # CONFIG_SND_SOC_AMD_ACP5x is not set
-# CONFIG_SND_SOC_AMD_ACP6x is not set
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 # CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set
 # CONFIG_SND_SOC_AMD_RENOIR is not set
 # CONFIG_SND_SOC_AMD_RENOIR_MACH is not set
-# CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
-# CONFIG_SND_SOC_AMD_YC_MACH is not set
 CONFIG_SND_SOC_APQ8016_SBC=m
 CONFIG_SND_SOC_ARNDALE=m
 CONFIG_SND_SOC_BD28623=m
@ -6843,8 +6838,6 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
-# CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
 CONFIG_SND_SOC_CS4234=m
 CONFIG_SND_SOC_CS4265=m
 # CONFIG_SND_SOC_CS4270 is not set
@ -6942,7 +6935,6 @@ CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set
@ -6965,7 +6957,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@ -6981,7 +6972,6 @@ CONFIG_SND_SOC_MT8195=m
 # CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
@ -7034,7 +7024,6 @@ CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
-# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 # CONFIG_SND_SOC_SAMSUNG is not set
 CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
--- a/SOURCES/kernel-aarch64-fedora.config
+++ b/SOURCES/kernel-aarch64-fedora.config
@ -4709,7 +4709,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NFC_PN532_UART is not set
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@ -6798,16 +6798,11 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_AMD_ACP3x is not set
 # CONFIG_SND_SOC_AMD_ACP5x is not set
-# CONFIG_SND_SOC_AMD_ACP6x is not set
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 # CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set
 # CONFIG_SND_SOC_AMD_RENOIR is not set
 # CONFIG_SND_SOC_AMD_RENOIR_MACH is not set
-# CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
-# CONFIG_SND_SOC_AMD_YC_MACH is not set
 CONFIG_SND_SOC_APQ8016_SBC=m
 CONFIG_SND_SOC_ARNDALE=m
 CONFIG_SND_SOC_BD28623=m
@ -6818,8 +6813,6 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
-# CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
 CONFIG_SND_SOC_CS4234=m
 CONFIG_SND_SOC_CS4265=m
 # CONFIG_SND_SOC_CS4270 is not set
@ -6917,7 +6910,6 @@ CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set
@ -6940,7 +6932,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@ -6956,7 +6947,6 @@ CONFIG_SND_SOC_MT8195=m
 # CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
@ -7009,7 +6999,6 @@ CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
-# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 # CONFIG_SND_SOC_SAMSUNG is not set
 CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
--- a/SOURCES/kernel-armv7hl-debug-fedora.config
+++ b/SOURCES/kernel-armv7hl-debug-fedora.config
@ -4805,7 +4805,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NFC_PN532_UART is not set
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@ -6967,16 +6967,11 @@ CONFIG_SND_SOC_AK5558=m
 CONFIG_SND_SOC_ALC5632=m
 # CONFIG_SND_SOC_AMD_ACP3x is not set
 # CONFIG_SND_SOC_AMD_ACP5x is not set
-# CONFIG_SND_SOC_AMD_ACP6x is not set
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 # CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set
 # CONFIG_SND_SOC_AMD_RENOIR is not set
 # CONFIG_SND_SOC_AMD_RENOIR_MACH is not set
-# CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
-# CONFIG_SND_SOC_AMD_YC_MACH is not set
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 CONFIG_SND_SOC_ARNDALE=m
 CONFIG_SND_SOC_BD28623=m
@ -6987,8 +6982,6 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
-# CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
 CONFIG_SND_SOC_CS4234=m
 CONFIG_SND_SOC_CS4265=m
 # CONFIG_SND_SOC_CS4270 is not set
@ -7090,7 +7083,6 @@ CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set
@ -7115,7 +7107,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@ -7131,7 +7122,6 @@ CONFIG_SND_SOC_MT8195=m
 # CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_NAU8825 is not set
@ -7187,7 +7177,6 @@ CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
-# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 CONFIG_SND_SOC_SAMSUNG=m
 CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
--- a/SOURCES/kernel-armv7hl-fedora.config
+++ b/SOURCES/kernel-armv7hl-fedora.config
@ -4782,7 +4782,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NFC_PN532_UART is not set
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@ -6943,16 +6943,11 @@ CONFIG_SND_SOC_AK5558=m
 CONFIG_SND_SOC_ALC5632=m
 # CONFIG_SND_SOC_AMD_ACP3x is not set
 # CONFIG_SND_SOC_AMD_ACP5x is not set
-# CONFIG_SND_SOC_AMD_ACP6x is not set
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 # CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set
 # CONFIG_SND_SOC_AMD_RENOIR is not set
 # CONFIG_SND_SOC_AMD_RENOIR_MACH is not set
-# CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
-# CONFIG_SND_SOC_AMD_YC_MACH is not set
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 CONFIG_SND_SOC_ARNDALE=m
 CONFIG_SND_SOC_BD28623=m
@ -6963,8 +6958,6 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
-# CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
 CONFIG_SND_SOC_CS4234=m
 CONFIG_SND_SOC_CS4265=m
 # CONFIG_SND_SOC_CS4270 is not set
@ -7066,7 +7059,6 @@ CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set
@ -7091,7 +7083,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@ -7107,7 +7098,6 @@ CONFIG_SND_SOC_MT8195=m
 # CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_NAU8825 is not set
@ -7163,7 +7153,6 @@ CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
-# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 CONFIG_SND_SOC_SAMSUNG=m
 CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
--- a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config
+++ b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config
@ -4703,7 +4703,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NFC_PN532_UART is not set
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@ -6769,16 +6769,11 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_AMD_ACP3x is not set
 # CONFIG_SND_SOC_AMD_ACP5x is not set
-# CONFIG_SND_SOC_AMD_ACP6x is not set
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 # CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set
 # CONFIG_SND_SOC_AMD_RENOIR is not set
 # CONFIG_SND_SOC_AMD_RENOIR_MACH is not set
-# CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
-# CONFIG_SND_SOC_AMD_YC_MACH is not set
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 CONFIG_SND_SOC_ARNDALE=m
 CONFIG_SND_SOC_BD28623=m
@ -6789,8 +6784,6 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
-# CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
 CONFIG_SND_SOC_CS4234=m
 CONFIG_SND_SOC_CS4265=m
 # CONFIG_SND_SOC_CS4270 is not set
@ -6888,7 +6881,6 @@ CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set
@ -6911,7 +6903,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@ -6927,7 +6918,6 @@ CONFIG_SND_SOC_MT8195=m
 # CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_NAU8825 is not set
@ -6980,7 +6970,6 @@ CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
-# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 CONFIG_SND_SOC_SAMSUNG=m
 CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
--- a/SOURCES/kernel-armv7hl-lpae-fedora.config
+++ b/SOURCES/kernel-armv7hl-lpae-fedora.config
@ -4680,7 +4680,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NFC_PN532_UART is not set
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@ -6745,16 +6745,11 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_AMD_ACP3x is not set
 # CONFIG_SND_SOC_AMD_ACP5x is not set
-# CONFIG_SND_SOC_AMD_ACP6x is not set
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 # CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set
 # CONFIG_SND_SOC_AMD_RENOIR is not set
 # CONFIG_SND_SOC_AMD_RENOIR_MACH is not set
-# CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
-# CONFIG_SND_SOC_AMD_YC_MACH is not set
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 CONFIG_SND_SOC_ARNDALE=m
 CONFIG_SND_SOC_BD28623=m
@ -6765,8 +6760,6 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
-# CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
 CONFIG_SND_SOC_CS4234=m
 CONFIG_SND_SOC_CS4265=m
 # CONFIG_SND_SOC_CS4270 is not set
@ -6864,7 +6857,6 @@ CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set
@ -6887,7 +6879,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@ -6903,7 +6894,6 @@ CONFIG_SND_SOC_MT8195=m
 # CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_NAU8825 is not set
@ -6956,7 +6946,6 @@ CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
-# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 CONFIG_SND_SOC_SAMSUNG=m
 CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
--- a/SOURCES/kernel-i686-debug-fedora.config
+++ b/SOURCES/kernel-i686-debug-fedora.config
@ -4317,7 +4317,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NFC_PN532_UART is not set
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@ -6132,28 +6132,21 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_SOC_AMD_ACP5x=m
-CONFIG_SND_SOC_AMD_ACP6x=m
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 CONFIG_SND_SOC_AMD_RENOIR=m
 CONFIG_SND_SOC_AMD_RENOIR_MACH=m
-CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
-CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
-CONFIG_SND_SOC_AMD_YC_MACH=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
-CONFIG_SND_SOC_CROS_EC_CODEC=m
+# CONFIG_SND_SOC_CROS_EC_CODEC is not set
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
-# CONFIG_SND_SOC_CS35L41_I2C is not set
-CONFIG_SND_SOC_CS35L41_SPI=m
 CONFIG_SND_SOC_CS4234=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@ -6251,7 +6244,6 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
-CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
@ -6274,7 +6266,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@ -6290,7 +6281,6 @@ CONFIG_SND_SOC_MT8195=m
 # CONFIG_SND_SOC_NAU8315 is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
-CONFIG_SND_SOC_NAU8821=m
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
@ -6343,7 +6333,6 @@ CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
-# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 # CONFIG_SND_SOC_SAMSUNG is not set
 # CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811 is not set
--- a/SOURCES/kernel-i686-fedora.config
+++ b/SOURCES/kernel-i686-fedora.config
@ -4294,7 +4294,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NFC_PN532_UART is not set
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@ -6108,28 +6108,21 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_SOC_AMD_ACP5x=m
-CONFIG_SND_SOC_AMD_ACP6x=m
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 CONFIG_SND_SOC_AMD_RENOIR=m
 CONFIG_SND_SOC_AMD_RENOIR_MACH=m
-CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
-CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
-CONFIG_SND_SOC_AMD_YC_MACH=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
-CONFIG_SND_SOC_CROS_EC_CODEC=m
+# CONFIG_SND_SOC_CROS_EC_CODEC is not set
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
-# CONFIG_SND_SOC_CS35L41_I2C is not set
-CONFIG_SND_SOC_CS35L41_SPI=m
 CONFIG_SND_SOC_CS4234=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@ -6227,7 +6220,6 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
-CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
@ -6250,7 +6242,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@ -6266,7 +6257,6 @@ CONFIG_SND_SOC_MT8195=m
 # CONFIG_SND_SOC_NAU8315 is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
-CONFIG_SND_SOC_NAU8821=m
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
@ -6319,7 +6309,6 @@ CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
-# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 # CONFIG_SND_SOC_SAMSUNG is not set
 # CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811 is not set
--- a/SOURCES/kernel-ppc64le-debug-fedora.config
+++ b/SOURCES/kernel-ppc64le-debug-fedora.config
@ -4051,7 +4051,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NFC_PN532_UART is not set
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@ -5814,16 +5814,11 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_AMD_ACP3x is not set
 # CONFIG_SND_SOC_AMD_ACP5x is not set
-# CONFIG_SND_SOC_AMD_ACP6x is not set
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 # CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set
 # CONFIG_SND_SOC_AMD_RENOIR is not set
 # CONFIG_SND_SOC_AMD_RENOIR_MACH is not set
-# CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
-# CONFIG_SND_SOC_AMD_YC_MACH is not set
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_BD28623=m
@ -5834,8 +5829,6 @@ CONFIG_SND_SOC_BD28623=m
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
-# CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
 CONFIG_SND_SOC_CS4234=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@ -5933,7 +5926,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set
@ -5956,7 +5948,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@ -5972,7 +5963,6 @@ CONFIG_SND_SOC_MT8195=m
 # CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_NAU8825 is not set
@ -6025,7 +6015,6 @@ CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
-# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 # CONFIG_SND_SOC_SAMSUNG is not set
 # CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811 is not set
--- a/SOURCES/kernel-ppc64le-fedora.config
+++ b/SOURCES/kernel-ppc64le-fedora.config
@ -4027,7 +4027,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NFC_PN532_UART is not set
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@ -5789,16 +5789,11 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_AMD_ACP3x is not set
 # CONFIG_SND_SOC_AMD_ACP5x is not set
-# CONFIG_SND_SOC_AMD_ACP6x is not set
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 # CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set
 # CONFIG_SND_SOC_AMD_RENOIR is not set
 # CONFIG_SND_SOC_AMD_RENOIR_MACH is not set
-# CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
-# CONFIG_SND_SOC_AMD_YC_MACH is not set
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_BD28623=m
@ -5809,8 +5804,6 @@ CONFIG_SND_SOC_BD28623=m
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
-# CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
 CONFIG_SND_SOC_CS4234=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@ -5908,7 +5901,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set
@ -5931,7 +5923,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@ -5947,7 +5938,6 @@ CONFIG_SND_SOC_MT8195=m
 # CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_NAU8825 is not set
@ -6000,7 +5990,6 @@ CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
-# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 # CONFIG_SND_SOC_SAMSUNG is not set
 # CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811 is not set
--- a/SOURCES/kernel-s390x-debug-fedora.config
+++ b/SOURCES/kernel-s390x-debug-fedora.config
@ -4031,7 +4031,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NFC_PN532_UART is not set
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@ -5766,16 +5766,11 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_AMD_ACP3x is not set
 # CONFIG_SND_SOC_AMD_ACP5x is not set
-# CONFIG_SND_SOC_AMD_ACP6x is not set
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 # CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set
 # CONFIG_SND_SOC_AMD_RENOIR is not set
 # CONFIG_SND_SOC_AMD_RENOIR_MACH is not set
-# CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
-# CONFIG_SND_SOC_AMD_YC_MACH is not set
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_BD28623=m
@ -5786,8 +5781,6 @@ CONFIG_SND_SOC_BD28623=m
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
-# CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
 CONFIG_SND_SOC_CS4234=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@ -5885,7 +5878,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set
@ -5908,7 +5900,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@ -5924,7 +5915,6 @@ CONFIG_SND_SOC_MT8195=m
 # CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_NAU8825 is not set
@ -5977,7 +5967,6 @@ CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
-# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 # CONFIG_SND_SOC_SAMSUNG is not set
 # CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811 is not set
--- a/SOURCES/kernel-s390x-fedora.config
+++ b/SOURCES/kernel-s390x-fedora.config
@ -4007,7 +4007,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NFC_PN532_UART is not set
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@ -5741,16 +5741,11 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_AMD_ACP3x is not set
 # CONFIG_SND_SOC_AMD_ACP5x is not set
-# CONFIG_SND_SOC_AMD_ACP6x is not set
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 # CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set
 # CONFIG_SND_SOC_AMD_RENOIR is not set
 # CONFIG_SND_SOC_AMD_RENOIR_MACH is not set
-# CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
-# CONFIG_SND_SOC_AMD_YC_MACH is not set
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_BD28623=m
@ -5761,8 +5756,6 @@ CONFIG_SND_SOC_BD28623=m
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
-# CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
 CONFIG_SND_SOC_CS4234=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@ -5860,7 +5853,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH is not set
 # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set
@ -5883,7 +5875,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@ -5899,7 +5890,6 @@ CONFIG_SND_SOC_MT8195=m
 # CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 # CONFIG_SND_SOC_NAU8825 is not set
@ -5952,7 +5942,6 @@ CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
-# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 # CONFIG_SND_SOC_SAMSUNG is not set
 # CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811 is not set
--- a/SOURCES/kernel-x86_64-debug-fedora.config
+++ b/SOURCES/kernel-x86_64-debug-fedora.config
@ -4361,7 +4361,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NFC_PN532_UART is not set
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@ -6184,16 +6184,11 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_SOC_AMD_ACP5x=m
-CONFIG_SND_SOC_AMD_ACP6x=m
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 CONFIG_SND_SOC_AMD_RENOIR=m
 CONFIG_SND_SOC_AMD_RENOIR_MACH=m
-CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
-CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
-CONFIG_SND_SOC_AMD_YC_MACH=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_BD28623=m
@ -6204,8 +6199,6 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
-# CONFIG_SND_SOC_CS35L41_I2C is not set
-CONFIG_SND_SOC_CS35L41_SPI=m
 CONFIG_SND_SOC_CS4234=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@ -6303,7 +6296,6 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
-CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
@ -6326,7 +6318,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@ -6342,7 +6333,6 @@ CONFIG_SND_SOC_MT8195=m
 # CONFIG_SND_SOC_NAU8315 is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
-CONFIG_SND_SOC_NAU8821=m
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
@ -6395,7 +6385,6 @@ CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
-# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 # CONFIG_SND_SOC_SAMSUNG is not set
 # CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811 is not set
--- a/SOURCES/kernel-x86_64-fedora.config
+++ b/SOURCES/kernel-x86_64-fedora.config
@ -4338,7 +4338,7 @@ CONFIG_NF_CONNTRACK_TFTP=m
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_ZONES=y
-# CONFIG_NFC_PN532_UART is not set
+CONFIG_NFC_PN532_UART=m
 CONFIG_NFC_PN533_I2C=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_PN533_USB=m
@ -6160,16 +6160,11 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_SOC_AMD_ACP5x=m
-CONFIG_SND_SOC_AMD_ACP6x=m
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 CONFIG_SND_SOC_AMD_RENOIR=m
 CONFIG_SND_SOC_AMD_RENOIR_MACH=m
-CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
-CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
-CONFIG_SND_SOC_AMD_YC_MACH=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 CONFIG_SND_SOC_BD28623=m
@ -6180,8 +6175,6 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
 CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
-# CONFIG_SND_SOC_CS35L41_I2C is not set
-CONFIG_SND_SOC_CS35L41_SPI=m
 CONFIG_SND_SOC_CS4234=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@ -6279,7 +6272,6 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
-CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
@ -6302,7 +6294,6 @@ CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
 # CONFIG_SND_SOC_MAX98504 is not set
-# CONFIG_SND_SOC_MAX98520 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
@ -6318,7 +6309,6 @@ CONFIG_SND_SOC_MT8195=m
 # CONFIG_SND_SOC_NAU8315 is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
-CONFIG_SND_SOC_NAU8821=m
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
@ -6371,7 +6361,6 @@ CONFIG_SND_SOC_RT711_SDCA_SDW=m
 CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
-# CONFIG_SND_SOC_RT9120 is not set
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
 # CONFIG_SND_SOC_SAMSUNG is not set
 # CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811 is not set
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@ -97,7 +97,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}

 # Do we have a -stable update to apply?
-%define stable_update 10
+%define stable_update 18
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@ -3006,6 +3006,9 @@ fi
 #
 #
 %changelog
+* Sat Jan 29 2022 Pablo Greco <pgreco@centosproject.org> - 5.15.18-200
+- Linux v5.15.18
+
 * Tue Dec 21 2021 Pablo Greco <pgreco@centosproject.org> - 5.15.10-200
 - Linux v5.15.10
 - Add Honeycomb support