kernel-5.19.0-0.rc2.20220615git018ab4fabddd.22

* Wed Jun 15 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc2.018ab4fabddd.21]
- redhat/self-test: Update data set (Prarit Bhargava)
- create-data.sh: Reduce specfile data output (Prarit Bhargava)
- redhat/configs: restore/fix core INTEL_LPSS configs to be builtin again (Hans de Goede)
- Enable CKI on os-build MRs only (Don Zickus)
- self-test: Fixup Makefile contents test (Prarit Bhargava)
- redhat/self-test: self-test data update (Prarit Bhargava)
- redhat/self-test: Fix up create-data.sh to not report local variables (Prarit Bhargava)
Resolves:

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

15 files changed, 73 insertions, 55 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index befbf776d..21f029aa9 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 21
+RHEL_RELEASE = 22
 
 #
 # ZSTREAM
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index a4f245fbb..0a14a56b0 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1591,7 +1591,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_COCO_SECRET is not set
+CONFIG_EFI_COCO_SECRET=y
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 # CONFIG_EFI_DISABLE_RUNTIME is not set
@@ -1600,7 +1600,6 @@ CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
 # CONFIG_EFI_RCI2_TABLE is not set
-# CONFIG_EFI_SECRET is not set
 CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_STUB=y
 # CONFIG_EFI_TEST is not set
@@ -6324,7 +6323,7 @@ CONFIG_TUN=m
 CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_FUSB302=m
 # CONFIG_TYPEC_HD3SS3220 is not set
-# CONFIG_TYPEC_MUX_FSA4480 is not set
+CONFIG_TYPEC_MUX_FSA4480=m
 CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_NVIDIA_ALTMODE is not set
 # CONFIG_TYPEC_QCOM_PMIC is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 2eb2b735e..b3232b0af 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1583,7 +1583,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_COCO_SECRET is not set
+CONFIG_EFI_COCO_SECRET=y
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 # CONFIG_EFI_DISABLE_RUNTIME is not set
@@ -1592,7 +1592,6 @@ CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
 # CONFIG_EFI_RCI2_TABLE is not set
-# CONFIG_EFI_SECRET is not set
 CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_STUB=y
 # CONFIG_EFI_TEST is not set
@@ -6299,7 +6298,7 @@ CONFIG_TUN=m
 CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_FUSB302=m
 # CONFIG_TYPEC_HD3SS3220 is not set
-# CONFIG_TYPEC_MUX_FSA4480 is not set
+CONFIG_TYPEC_MUX_FSA4480=m
 CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_NVIDIA_ALTMODE is not set
 # CONFIG_TYPEC_QCOM_PMIC is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index d10e15585..d60f815e5 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1432,7 +1432,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_COCO_SECRET is not set
+CONFIG_EFI_COCO_SECRET=y
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 # CONFIG_EFI_DISABLE_RUNTIME is not set
@@ -1441,7 +1441,6 @@ CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
 # CONFIG_EFI_RCI2_TABLE is not set
-# CONFIG_EFI_SECRET is not set
 CONFIG_EFI_SOFT_RESERVE=y
 # CONFIG_EFI_TEST is not set
 # CONFIG_EFS_FS is not set
@@ -5032,7 +5031,11 @@ CONFIG_SFC=m
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MTD=y
-# CONFIG_SFC_SIENA is not set
+CONFIG_SFC_SIENA=m
+CONFIG_SFC_SIENA_MCDI_LOGGING=y
+CONFIG_SFC_SIENA_MCDI_MON=y
+CONFIG_SFC_SIENA_MTD=y
+CONFIG_SFC_SIENA_SRIOV=y
 CONFIG_SFC_SRIOV=y
 # CONFIG_SF_PDMA is not set
 CONFIG_SGETMASK_SYSCALL=y
@@ -6080,7 +6083,7 @@ CONFIG_TUN_VNET_CROSS_LE=y
 CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_FUSB302=m
 # CONFIG_TYPEC_HD3SS3220 is not set
-# CONFIG_TYPEC_MUX_FSA4480 is not set
+CONFIG_TYPEC_MUX_FSA4480=m
 CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_NVIDIA_ALTMODE is not set
 # CONFIG_TYPEC_QCOM_PMIC is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 2591c44a0..d1bc143f1 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1424,7 +1424,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_COCO_SECRET is not set
+CONFIG_EFI_COCO_SECRET=y
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 # CONFIG_EFI_DISABLE_RUNTIME is not set
@@ -1433,7 +1433,6 @@ CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
 # CONFIG_EFI_RCI2_TABLE is not set
-# CONFIG_EFI_SECRET is not set
 CONFIG_EFI_SOFT_RESERVE=y
 # CONFIG_EFI_TEST is not set
 # CONFIG_EFS_FS is not set
@@ -5011,7 +5010,11 @@ CONFIG_SFC=m
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MTD=y
-# CONFIG_SFC_SIENA is not set
+CONFIG_SFC_SIENA=m
+CONFIG_SFC_SIENA_MCDI_LOGGING=y
+CONFIG_SFC_SIENA_MCDI_MON=y
+CONFIG_SFC_SIENA_MTD=y
+CONFIG_SFC_SIENA_SRIOV=y
 CONFIG_SFC_SRIOV=y
 # CONFIG_SF_PDMA is not set
 CONFIG_SGETMASK_SYSCALL=y
@@ -6057,7 +6060,7 @@ CONFIG_TUN_VNET_CROSS_LE=y
 CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_FUSB302=m
 # CONFIG_TYPEC_HD3SS3220 is not set
-# CONFIG_TYPEC_MUX_FSA4480 is not set
+CONFIG_TYPEC_MUX_FSA4480=m
 CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_NVIDIA_ALTMODE is not set
 # CONFIG_TYPEC_QCOM_PMIC is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index cf06efa83..e493bf048 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1437,7 +1437,7 @@ CONFIG_EDAC_PND2=m
 # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_COCO_SECRET is not set
+CONFIG_EFI_COCO_SECRET=y
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 # CONFIG_EFI_DISABLE_RUNTIME is not set
@@ -1446,7 +1446,6 @@ CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
 # CONFIG_EFI_RCI2_TABLE is not set
-# CONFIG_EFI_SECRET is not set
 CONFIG_EFI_SOFT_RESERVE=y
 # CONFIG_EFI_TEST is not set
 # CONFIG_EFS_FS is not set
@@ -6073,7 +6072,7 @@ CONFIG_TUN=m
 CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_FUSB302=m
 # CONFIG_TYPEC_HD3SS3220 is not set
-# CONFIG_TYPEC_MUX_FSA4480 is not set
+CONFIG_TYPEC_MUX_FSA4480=m
 CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_NVIDIA_ALTMODE is not set
 # CONFIG_TYPEC_QCOM_PMIC is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index a3b05eec1..a1605fab7 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1429,7 +1429,7 @@ CONFIG_EDAC_PND2=m
 # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_COCO_SECRET is not set
+CONFIG_EFI_COCO_SECRET=y
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 # CONFIG_EFI_DISABLE_RUNTIME is not set
@@ -1438,7 +1438,6 @@ CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
 # CONFIG_EFI_RCI2_TABLE is not set
-# CONFIG_EFI_SECRET is not set
 CONFIG_EFI_SOFT_RESERVE=y
 # CONFIG_EFI_TEST is not set
 # CONFIG_EFS_FS is not set
@@ -6050,7 +6049,7 @@ CONFIG_TUN=m
 CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_FUSB302=m
 # CONFIG_TYPEC_HD3SS3220 is not set
-# CONFIG_TYPEC_MUX_FSA4480 is not set
+CONFIG_TYPEC_MUX_FSA4480=m
 CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_NVIDIA_ALTMODE is not set
 # CONFIG_TYPEC_QCOM_PMIC is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 3dd14d953..e558ceec1 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -1434,7 +1434,7 @@ CONFIG_EDAC_PND2=m
 # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_COCO_SECRET is not set
+CONFIG_EFI_COCO_SECRET=y
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 # CONFIG_EFI_DISABLE_RUNTIME is not set
@@ -1443,7 +1443,6 @@ CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
 # CONFIG_EFI_RCI2_TABLE is not set
-# CONFIG_EFI_SECRET is not set
 CONFIG_EFI_SOFT_RESERVE=y
 # CONFIG_EFI_TEST is not set
 # CONFIG_EFS_FS is not set
@@ -6076,7 +6075,7 @@ CONFIG_TUNE_Z15=y
 CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_FUSB302=m
 # CONFIG_TYPEC_HD3SS3220 is not set
-# CONFIG_TYPEC_MUX_FSA4480 is not set
+CONFIG_TYPEC_MUX_FSA4480=m
 CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_NVIDIA_ALTMODE is not set
 # CONFIG_TYPEC_QCOM_PMIC is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 0b5e865a5..48037d482 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -3600,9 +3600,9 @@ CONFIG_MFD_ENE_KB3930=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI6421_SPMI is not set
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
+CONFIG_MFD_INTEL_LPSS=y
 CONFIG_MFD_INTEL_M10_BMC=m
 CONFIG_MFD_INTEL_PMC_BXT=m
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 9c633d5a7..f976bf216 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1532,7 +1532,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_COCO_SECRET is not set
+CONFIG_EFI_COCO_SECRET=y
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 # CONFIG_EFI_DISABLE_RUNTIME is not set
@@ -1544,7 +1544,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
 CONFIG_EFI_RCI2_TABLE=y
 CONFIG_EFI_RUNTIME_MAP=y
-# CONFIG_EFI_SECRET is not set
+CONFIG_EFI_SECRET=m
 CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_STUB=y
 # CONFIG_EFI_TEST is not set
@@ -3123,9 +3123,9 @@ 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_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
+CONFIG_MFD_INTEL_LPSS=y
 # CONFIG_MFD_INTEL_M10_BMC is not set
 # CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
@@ -5229,7 +5229,11 @@ CONFIG_SFC=m
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MTD=y
-# CONFIG_SFC_SIENA is not set
+CONFIG_SFC_SIENA=m
+CONFIG_SFC_SIENA_MCDI_LOGGING=y
+CONFIG_SFC_SIENA_MCDI_MON=y
+CONFIG_SFC_SIENA_MTD=y
+CONFIG_SFC_SIENA_SRIOV=y
 CONFIG_SFC_SRIOV=y
 # CONFIG_SF_PDMA is not set
 # CONFIG_SFP is not set
@@ -6310,7 +6314,7 @@ CONFIG_TUN=m
 CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_FUSB302=m
 # CONFIG_TYPEC_HD3SS3220 is not set
-# CONFIG_TYPEC_MUX_FSA4480 is not set
+CONFIG_TYPEC_MUX_FSA4480=m
 CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_NVIDIA_ALTMODE is not set
 # CONFIG_TYPEC_QCOM_PMIC is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 2f3437849..18f14be4b 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -3581,9 +3581,9 @@ CONFIG_MFD_ENE_KB3930=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI6421_SPMI is not set
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
+CONFIG_MFD_INTEL_LPSS=y
 CONFIG_MFD_INTEL_M10_BMC=m
 CONFIG_MFD_INTEL_PMC_BXT=m
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 7e5ce0b34..31db98d44 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1524,7 +1524,7 @@ CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_COCO_SECRET is not set
+CONFIG_EFI_COCO_SECRET=y
 CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
 # CONFIG_EFI_DISABLE_PCI_DMA is not set
 # CONFIG_EFI_DISABLE_RUNTIME is not set
@@ -1536,7 +1536,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
 CONFIG_EFI_RCI2_TABLE=y
 CONFIG_EFI_RUNTIME_MAP=y
-# CONFIG_EFI_SECRET is not set
+CONFIG_EFI_SECRET=m
 CONFIG_EFI_SOFT_RESERVE=y
 CONFIG_EFI_STUB=y
 # CONFIG_EFI_TEST is not set
@@ -3103,9 +3103,9 @@ 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_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
+CONFIG_MFD_INTEL_LPSS=y
 # CONFIG_MFD_INTEL_M10_BMC is not set
 # CONFIG_MFD_INTEL_PMC_BXT is not set
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
@@ -5207,7 +5207,11 @@ CONFIG_SFC=m
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_MTD=y
-# CONFIG_SFC_SIENA is not set
+CONFIG_SFC_SIENA=m
+CONFIG_SFC_SIENA_MCDI_LOGGING=y
+CONFIG_SFC_SIENA_MCDI_MON=y
+CONFIG_SFC_SIENA_MTD=y
+CONFIG_SFC_SIENA_SRIOV=y
 CONFIG_SFC_SRIOV=y
 # CONFIG_SF_PDMA is not set
 # CONFIG_SFP is not set
@@ -6286,7 +6290,7 @@ CONFIG_TUN=m
 CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_FUSB302=m
 # CONFIG_TYPEC_HD3SS3220 is not set
-# CONFIG_TYPEC_MUX_FSA4480 is not set
+CONFIG_TYPEC_MUX_FSA4480=m
 CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_NVIDIA_ALTMODE is not set
 # CONFIG_TYPEC_QCOM_PMIC is not set
diff --git a/kernel.spec b/kernel.spec
index c37b871e5..98fe49e01 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -120,17 +120,17 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
 #  to build the base kernel using the debug configuration. (Specifying
 #  the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 # define buildid .local
 %define specversion 5.19.0
 %define patchversion 5.19
-%define pkgrelease 0.rc2.21
+%define pkgrelease 0.rc2.20220615git018ab4fabddd.22
 %define kversion 5
-%define tarfile_release 5.19-rc2
+%define tarfile_release 5.19-rc2-50-g018ab4fabddd
 # This is needed to do merge window version magic
 %define patchlevel 19
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.21%{?buildid}%{?dist}
+%define specrelease 0.rc2.20220615git018ab4fabddd.22%{?buildid}%{?dist}
 
 #
 # End of genspec.sh variables
@@ -3040,6 +3040,15 @@ fi
 #
 #
 %changelog
+* Wed Jun 15 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc2.018ab4fabddd.21]
+- redhat/self-test: Update data set (Prarit Bhargava)
+- create-data.sh: Reduce specfile data output (Prarit Bhargava)
+- redhat/configs: restore/fix core INTEL_LPSS configs to be builtin again (Hans de Goede)
+- Enable CKI on os-build MRs only (Don Zickus)
+- self-test: Fixup Makefile contents test (Prarit Bhargava)
+- redhat/self-test: self-test data update (Prarit Bhargava)
+- redhat/self-test: Fix up create-data.sh to not report local variables (Prarit Bhargava)
+
 * Sun Jun 12 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc1.7a68065eb9cd.19]
 - redhat/configs/fedora: Enable a set of modules used on some x86 tablets (Hans de Goede)
 - redhat/configs: Make INTEL_SOC_PMIC_CHTDC_TI builtin (Hans de Goede)
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch
index 97e1b74f0..913e00fc1 100644
--- a/patch-5.19-redhat.patch
+++ b/patch-5.19-redhat.patch
@@ -67,10 +67,10 @@
  66 files changed, 1544 insertions(+), 187 deletions(-)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 8090130b544b..2a0dc78f340f 100644
+index 2522b11e593f..852307b46301 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -6237,6 +6237,15 @@
+@@ -6272,6 +6272,15 @@
  	unknown_nmi_panic
  			[X86] Cause panic on unknown NMI.
 
@@ -250,10 +250,10 @@ index 8d91eccc0963..d5a41405b466 100644
  	/* boot_command_line has been already set up in early.c */
  	*cmdline_p = boot_command_line;
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index c296cb1c0113..beae6350a8ab 100644
+index 4730b0a58f24..ee654b3d6d6e 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
-@@ -1461,6 +1461,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
+@@ -1507,6 +1507,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
  		cpu_detect(c);
  		get_cpu_vendor(c);
  		get_cpu_cap(c);
diff --git a/sources b/sources
index 430d88021..7142e71f9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.19-rc2.tar.xz) = a9820eb76451f92b13e811719b0d63e86d9b868db51d648b20c065a7b3bd7d273c6f11316178e602d9fc64d9394eebebdf67ac05b0814113e3ed99bdd9e6adf6
-SHA512 (kernel-abi-stablelists-5.19.0-0.rc2.21.tar.bz2) = 37621518bf26c93ef6b49158edce123da96c299a6c672d61f4edd7a3a6ba6acb835f1085b03a70fc3fd8e2f0f58e0cec1f3973574fc1ea43f5d22e048549a4db
-SHA512 (kernel-kabi-dw-5.19.0-0.rc2.21.tar.bz2) = 91dad1f8957c2dda756421b1f62bd34aec602039e9cd429dccbee1f6c5a30e519241aee2636ee7aeaf136a7940cce3f5011d5f7b9b9a0d5b65c0196e3d77913e
+SHA512 (linux-5.19-rc2-50-g018ab4fabddd.tar.xz) = 060aab938d16266688148b6b57d4a5860677bbeca6b993756f6b1423f6fc1a11ccfccc917efecd8c5de0e1395c217132abce15b548caa33f3dfb2c5f17366af3
+SHA512 (kernel-abi-stablelists-5.19.0-0.rc2.20220615git018ab4fabddd.22.tar.bz2) = 9651784af07f120091457d563fd3fdfed199caf5cee38bf5d7fa4bda8af14c071c930c21f553058a808443bbbb11e1ecbf6cb82b46d21140863dd43c37a668b9
+SHA512 (kernel-kabi-dw-5.19.0-0.rc2.20220615git018ab4fabddd.22.tar.bz2) = c550e01ba2b8ecba1b5c0e7f1608de1eef78e9dc94396f4355171a2a452ec3044c659e9f123a484266404f85444dfb01d67588dd4e193e6333470fb9909c3010