kernel-6.2.0-0.rc6.20230202git9f266ccaa2f5.46

* Thu Feb 02 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc6.9f266ccaa2f5.46]
- redhat/configs: Enable CONFIG_SENSORS_LM90 for RHEL (Mark Salter)
- Fix up SQUASHFS decompression configs (Justin M. Forbes)
- redhat/configs: enable CONFIG_OCTEON_EP as a module in ARK (Michal Schmidt) [2041990]
- redhat: ignore rpminspect runpath report on urandom_read selftest binaries (Herton R. Krzesinski)
- kernel.spec: add llvm-devel build requirement (Scott Weaver)
- Update self-test data to not expect debugbuildsenabled 0 (Justin M. Forbes)
- Turn off forced debug builds (Justin M. Forbes)
- Turn on debug builds for aarch64 Fedora (Justin M. Forbes)
- redhat/configs:  modify merge.py to match old overrides input (Clark Williams)
- redhat:  fixup pylint complaints (Clark Williams)
- redhat: remove merge.pl and references to it (Clark Williams)
- redhat: update merge.py to handle merge.pl corner cases (Clark Williams)
- Revert "redhat: fix elf got hardening for vm tools" (Don Zickus)
- Linux v6.2.0-0.rc6.9f266ccaa2f5
Resolves: rhbz#2041990

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

16 files changed, 150 insertions, 213 deletions

diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index bd3b8ef54..9e5db31a6 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -4170,7 +4170,7 @@ CONFIG_NVME_TCP=m
 # CONFIG_NXP_C45_TJA11XX_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_OCTEON_EP is not set
+CONFIG_OCTEON_EP=m
 # CONFIG_OCTEONTX2_AF is not set
 CONFIG_OCTEONTX2_MBOX=m
 # CONFIG_OCTEONTX2_PF is not set
@@ -5238,7 +5238,7 @@ CONFIG_SENSORS_LM70=m
 # CONFIG_SENSORS_LM83 is not set
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
+CONFIG_SENSORS_LM90=m
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_LM95234 is not set
@@ -6175,11 +6175,11 @@ CONFIG_SPI=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -7260,12 +7260,8 @@ CONFIG_XILINX_GMII2RGMII=m
 # CONFIG_XILLYBUS is not set
 # CONFIG_XILLYUSB is not set
 CONFIG_XMON_DEFAULT_RO_MODE=y
-# CONFIG_XZ_DEC_ARM ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_ARMTHUMB ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_IA64 ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_POWERPC=y
-# CONFIG_XZ_DEC_SPARC ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 8b77b5795..421d82700 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -4149,7 +4149,7 @@ CONFIG_NVME_TCP=m
 # CONFIG_NXP_C45_TJA11XX_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_OCTEON_EP is not set
+CONFIG_OCTEON_EP=m
 # CONFIG_OCTEONTX2_AF is not set
 CONFIG_OCTEONTX2_MBOX=m
 # CONFIG_OCTEONTX2_PF is not set
@@ -5215,7 +5215,7 @@ CONFIG_SENSORS_LM70=m
 # CONFIG_SENSORS_LM83 is not set
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
+CONFIG_SENSORS_LM90=m
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_LM93 is not set
 # CONFIG_SENSORS_LM95234 is not set
@@ -6150,11 +6150,11 @@ CONFIG_SPI=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -7235,12 +7235,8 @@ CONFIG_XILINX_GMII2RGMII=m
 # CONFIG_XILLYBUS is not set
 # CONFIG_XILLYUSB is not set
 CONFIG_XMON_DEFAULT_RO_MODE=y
-# CONFIG_XZ_DEC_ARM ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_ARMTHUMB ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_IA64 ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_POWERPC=y
-# CONFIG_XZ_DEC_SPARC ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 8cb62f71a..19ccec8ce 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -3951,7 +3951,7 @@ CONFIG_NVRAM=m
 # CONFIG_NXP_C45_TJA11XX_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_OCTEON_EP is not set
+CONFIG_OCTEON_EP=m
 CONFIG_OCXL=m
 # CONFIG_OF_OVERLAY is not set
 CONFIG_OF_PMEM=m
@@ -5924,11 +5924,11 @@ CONFIG_SPI_AMD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -6988,12 +6988,8 @@ CONFIG_XILINX_GMII2RGMII=m
 CONFIG_XMON_DEFAULT_RO_MODE=y
 CONFIG_XMON_DISASSEMBLY=y
 CONFIG_XMON=y
-# CONFIG_XZ_DEC_ARM ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_ARMTHUMB ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_IA64 ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_POWERPC=y
-# CONFIG_XZ_DEC_SPARC ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 224413242..a1fcde9af 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -3931,7 +3931,7 @@ CONFIG_NVRAM=m
 # CONFIG_NXP_C45_TJA11XX_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_OCTEON_EP is not set
+CONFIG_OCTEON_EP=m
 CONFIG_OCXL=m
 # CONFIG_OF_OVERLAY is not set
 CONFIG_OF_PMEM=m
@@ -5901,11 +5901,11 @@ CONFIG_SPI_AMD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -6965,12 +6965,8 @@ CONFIG_XILINX_GMII2RGMII=m
 CONFIG_XMON_DEFAULT_RO_MODE=y
 CONFIG_XMON_DISASSEMBLY=y
 CONFIG_XMON=y
-# CONFIG_XZ_DEC_ARM ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_ARMTHUMB ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_IA64 ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_POWERPC=y
-# CONFIG_XZ_DEC_SPARC ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index b99d869df..07c59a39a 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -3935,7 +3935,7 @@ CONFIG_NVME_TCP=m
 # CONFIG_NXP_C45_TJA11XX_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_OCTEON_EP is not set
+CONFIG_OCTEON_EP=m
 CONFIG_OCXL=m
 # CONFIG_OF is not set
 # CONFIG_OF_OVERLAY is not set
@@ -5900,11 +5900,11 @@ CONFIG_SPI_AMD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -6973,12 +6973,8 @@ CONFIG_XILINX_GMII2RGMII=m
 # CONFIG_XILLYBUS is not set
 # CONFIG_XILLYUSB is not set
 CONFIG_XMON_DEFAULT_RO_MODE=y
-# CONFIG_XZ_DEC_ARM ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_ARMTHUMB ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_IA64 ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_POWERPC=y
-# CONFIG_XZ_DEC_SPARC ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 9aab92ff6..fc9c99937 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -3915,7 +3915,7 @@ CONFIG_NVME_TCP=m
 # CONFIG_NXP_C45_TJA11XX_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_OCTEON_EP is not set
+CONFIG_OCTEON_EP=m
 CONFIG_OCXL=m
 # CONFIG_OF is not set
 # CONFIG_OF_OVERLAY is not set
@@ -5877,11 +5877,11 @@ CONFIG_SPI_AMD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -6950,12 +6950,8 @@ CONFIG_XILINX_GMII2RGMII=m
 # CONFIG_XILLYBUS is not set
 # CONFIG_XILLYUSB is not set
 CONFIG_XMON_DEFAULT_RO_MODE=y
-# CONFIG_XZ_DEC_ARM ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_ARMTHUMB ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_IA64 ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_POWERPC=y
-# CONFIG_XZ_DEC_SPARC ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index cd872c732..616c0b14d 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -3929,7 +3929,7 @@ CONFIG_NVME_TCP=m
 # CONFIG_NXP_C45_TJA11XX_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_OCTEON_EP is not set
+CONFIG_OCTEON_EP=m
 CONFIG_OCXL=m
 # CONFIG_OF is not set
 # CONFIG_OF_OVERLAY is not set
@@ -5898,11 +5898,11 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -6977,12 +6977,8 @@ CONFIG_XILINX_GMII2RGMII=m
 # CONFIG_XILLYBUS is not set
 # CONFIG_XILLYUSB is not set
 CONFIG_XMON_DEFAULT_RO_MODE=y
-# CONFIG_XZ_DEC_ARM ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_ARMTHUMB ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_IA64 ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_POWERPC=y
-# CONFIG_XZ_DEC_SPARC ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 9d5e0c34b..61f7b77e2 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -6656,48 +6656,35 @@ CONFIG_SND_SOC_SIMPLE_MUX=m
 # CONFIG_SND_SOC_SMDK_WM8994_PCM is not set
 # CONFIG_SND_SOC_SNOW is not set
 CONFIG_SND_SOC_SOF_ACPI=m
-# CONFIG_SND_SOC_SOF_ALDERLAKE:
 CONFIG_SND_SOC_SOF_ALDERLAKE=m
 CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m
 CONFIG_SND_SOC_SOF_AMD_RENOIR=m
 CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m
-# CONFIG_SND_SOC_SOF_APOLLOLAKE:
 CONFIG_SND_SOC_SOF_APOLLOLAKE=m
-# CONFIG_SND_SOC_SOF_BAYTRAIL:
 CONFIG_SND_SOC_SOF_BAYTRAIL=m
-# CONFIG_SND_SOC_SOF_BROADWELL:
 CONFIG_SND_SOC_SOF_BROADWELL=m
-# CONFIG_SND_SOC_SOF_CANNONLAKE:
 CONFIG_SND_SOC_SOF_CANNONLAKE=m
-# CONFIG_SND_SOC_SOF_COFFEELAKE:
 CONFIG_SND_SOC_SOF_COFFEELAKE=m
-# CONFIG_SND_SOC_SOF_COMETLAKE:
 CONFIG_SND_SOC_SOF_COMETLAKE=m
-# CONFIG_SND_SOC_SOF_ELKHARTLAKE:
 CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
 CONFIG_SND_SOC_SOF_GEMINILAKE=m
 CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
 CONFIG_SND_SOC_SOF_HDA_LINK=y
 CONFIG_SND_SOC_SOF_HDA_PROBES=m
-# CONFIG_SND_SOC_SOF_ICELAKE:
 CONFIG_SND_SOC_SOF_ICELAKE=m
 # CONFIG_SND_SOC_SOF_IMX8M_SUPPORT is not set
 # CONFIG_SND_SOC_SOF_IMX8_SUPPORT is not set
 # CONFIG_SND_SOC_SOF_IMX_TOPLEVEL is not set
-# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE:
 CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
 CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
-# CONFIG_SND_SOC_SOF_JASPERLAKE:
 CONFIG_SND_SOC_SOF_JASPERLAKE=m
 CONFIG_SND_SOC_SOF_KABYLAKE=m
-# CONFIG_SND_SOC_SOF_MERRIFIELD:
 CONFIG_SND_SOC_SOF_MERRIFIELD=m
 CONFIG_SND_SOC_SOF_METEORLAKE=m
 # CONFIG_SND_SOC_SOF_MT8195 is not set
 # CONFIG_SND_SOC_SOF_OF is not set
 CONFIG_SND_SOC_SOF_PCI=m
 CONFIG_SND_SOC_SOF_SKYLAKE=m
-# CONFIG_SND_SOC_SOF_TIGERLAKE:
 CONFIG_SND_SOC_SOF_TIGERLAKE=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SPDIF=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index ec3cf017b..ee2368ffb 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -868,7 +868,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_CPUMASK_KUNIT_TEST=m
 CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
-# CONFIG_CPU_SUP_CENTAUR ignored for predicate CONFIG_EXPERT
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CPU_UNRET_ENTRY=y
 # CONFIG_CRAMFS is not set
@@ -4132,7 +4131,7 @@ CONFIG_NVSW_SN2201=m
 # CONFIG_NXP_C45_TJA11XX_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_OCTEON_EP is not set
+CONFIG_OCTEON_EP=m
 CONFIG_OCXL=m
 # CONFIG_OF is not set
 # CONFIG_OF_OVERLAY is not set
@@ -5887,45 +5886,32 @@ CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SMDK_WM8994_PCM is not set
 # CONFIG_SND_SOC_SNOW is not set
 CONFIG_SND_SOC_SOF_ACPI=m
-# CONFIG_SND_SOC_SOF_ALDERLAKE:
 CONFIG_SND_SOC_SOF_ALDERLAKE=m
 # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set
-# CONFIG_SND_SOC_SOF_APOLLOLAKE:
 CONFIG_SND_SOC_SOF_APOLLOLAKE=m
-# CONFIG_SND_SOC_SOF_BAYTRAIL:
 CONFIG_SND_SOC_SOF_BAYTRAIL=m
-# CONFIG_SND_SOC_SOF_BROADWELL:
 CONFIG_SND_SOC_SOF_BROADWELL=m
-# CONFIG_SND_SOC_SOF_CANNONLAKE:
 CONFIG_SND_SOC_SOF_CANNONLAKE=m
-# CONFIG_SND_SOC_SOF_COFFEELAKE:
 CONFIG_SND_SOC_SOF_COFFEELAKE=m
-# CONFIG_SND_SOC_SOF_COMETLAKE:
 CONFIG_SND_SOC_SOF_COMETLAKE=m
-# CONFIG_SND_SOC_SOF_ELKHARTLAKE:
 CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
 CONFIG_SND_SOC_SOF_GEMINILAKE=m
 CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
 CONFIG_SND_SOC_SOF_HDA_LINK=y
 CONFIG_SND_SOC_SOF_HDA_PROBES=m
-# CONFIG_SND_SOC_SOF_ICELAKE:
 CONFIG_SND_SOC_SOF_ICELAKE=m
 # CONFIG_SND_SOC_SOF_IMX8M_SUPPORT is not set
 # CONFIG_SND_SOC_SOF_IMX8_SUPPORT is not set
 # CONFIG_SND_SOC_SOF_IMX_TOPLEVEL is not set
-# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE:
 CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
 CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
-# CONFIG_SND_SOC_SOF_JASPERLAKE:
 CONFIG_SND_SOC_SOF_JASPERLAKE=m
 CONFIG_SND_SOC_SOF_KABYLAKE=m
-# CONFIG_SND_SOC_SOF_MERRIFIELD:
 CONFIG_SND_SOC_SOF_MERRIFIELD=m
 CONFIG_SND_SOC_SOF_METEORLAKE=m
 # CONFIG_SND_SOC_SOF_OF is not set
 CONFIG_SND_SOC_SOF_PCI=m
 CONFIG_SND_SOC_SOF_SKYLAKE=m
-# CONFIG_SND_SOC_SOF_TIGERLAKE:
 CONFIG_SND_SOC_SOF_TIGERLAKE=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 # CONFIG_SND_SOC_SPDIF is not set
@@ -6149,11 +6135,11 @@ CONFIG_SPI=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -7304,12 +7290,8 @@ CONFIG_XILINX_GMII2RGMII=m
 # CONFIG_XILLYBUS is not set
 # CONFIG_XILLYUSB is not set
 CONFIG_XMON_DEFAULT_RO_MODE=y
-# CONFIG_XZ_DEC_ARM ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_ARMTHUMB ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_IA64 ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_POWERPC=y
-# CONFIG_XZ_DEC_SPARC ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 4b899ae72..575d23e65 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -6635,47 +6635,34 @@ CONFIG_SND_SOC_SIMPLE_MUX=m
 # CONFIG_SND_SOC_SMDK_WM8994_PCM is not set
 # CONFIG_SND_SOC_SNOW is not set
 CONFIG_SND_SOC_SOF_ACPI=m
-# CONFIG_SND_SOC_SOF_ALDERLAKE:
 CONFIG_SND_SOC_SOF_ALDERLAKE=m
 CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m
 CONFIG_SND_SOC_SOF_AMD_RENOIR=m
 CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m
-# CONFIG_SND_SOC_SOF_APOLLOLAKE:
 CONFIG_SND_SOC_SOF_APOLLOLAKE=m
-# CONFIG_SND_SOC_SOF_BAYTRAIL:
 CONFIG_SND_SOC_SOF_BAYTRAIL=m
-# CONFIG_SND_SOC_SOF_BROADWELL:
 CONFIG_SND_SOC_SOF_BROADWELL=m
-# CONFIG_SND_SOC_SOF_CANNONLAKE:
 CONFIG_SND_SOC_SOF_CANNONLAKE=m
-# CONFIG_SND_SOC_SOF_COFFEELAKE:
 CONFIG_SND_SOC_SOF_COFFEELAKE=m
-# CONFIG_SND_SOC_SOF_COMETLAKE:
 CONFIG_SND_SOC_SOF_COMETLAKE=m
-# CONFIG_SND_SOC_SOF_ELKHARTLAKE:
 CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
 CONFIG_SND_SOC_SOF_GEMINILAKE=m
 CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
 CONFIG_SND_SOC_SOF_HDA_LINK=y
-# CONFIG_SND_SOC_SOF_ICELAKE:
 CONFIG_SND_SOC_SOF_ICELAKE=m
 # CONFIG_SND_SOC_SOF_IMX8M_SUPPORT is not set
 # CONFIG_SND_SOC_SOF_IMX8_SUPPORT is not set
 # CONFIG_SND_SOC_SOF_IMX_TOPLEVEL is not set
-# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE:
 CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
 CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
-# CONFIG_SND_SOC_SOF_JASPERLAKE:
 CONFIG_SND_SOC_SOF_JASPERLAKE=m
 CONFIG_SND_SOC_SOF_KABYLAKE=m
-# CONFIG_SND_SOC_SOF_MERRIFIELD:
 CONFIG_SND_SOC_SOF_MERRIFIELD=m
 CONFIG_SND_SOC_SOF_METEORLAKE=m
 # CONFIG_SND_SOC_SOF_MT8195 is not set
 # CONFIG_SND_SOC_SOF_OF is not set
 CONFIG_SND_SOC_SOF_PCI=m
 CONFIG_SND_SOC_SOF_SKYLAKE=m
-# CONFIG_SND_SOC_SOF_TIGERLAKE:
 CONFIG_SND_SOC_SOF_TIGERLAKE=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SPDIF=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 793b60c79..64dd009fe 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -868,7 +868,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_CPUMASK_KUNIT_TEST=m
 CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
-# CONFIG_CPU_SUP_CENTAUR ignored for predicate CONFIG_EXPERT
 # CONFIG_CPU_THERMAL is not set
 CONFIG_CPU_UNRET_ENTRY=y
 # CONFIG_CRAMFS is not set
@@ -4112,7 +4111,7 @@ CONFIG_NVSW_SN2201=m
 # CONFIG_NXP_C45_TJA11XX_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
 # CONFIG_OCFS2_FS is not set
-# CONFIG_OCTEON_EP is not set
+CONFIG_OCTEON_EP=m
 CONFIG_OCXL=m
 # CONFIG_OF is not set
 # CONFIG_OF_OVERLAY is not set
@@ -5864,44 +5863,31 @@ CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SMDK_WM8994_PCM is not set
 # CONFIG_SND_SOC_SNOW is not set
 CONFIG_SND_SOC_SOF_ACPI=m
-# CONFIG_SND_SOC_SOF_ALDERLAKE:
 CONFIG_SND_SOC_SOF_ALDERLAKE=m
 # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set
-# CONFIG_SND_SOC_SOF_APOLLOLAKE:
 CONFIG_SND_SOC_SOF_APOLLOLAKE=m
-# CONFIG_SND_SOC_SOF_BAYTRAIL:
 CONFIG_SND_SOC_SOF_BAYTRAIL=m
-# CONFIG_SND_SOC_SOF_BROADWELL:
 CONFIG_SND_SOC_SOF_BROADWELL=m
-# CONFIG_SND_SOC_SOF_CANNONLAKE:
 CONFIG_SND_SOC_SOF_CANNONLAKE=m
-# CONFIG_SND_SOC_SOF_COFFEELAKE:
 CONFIG_SND_SOC_SOF_COFFEELAKE=m
-# CONFIG_SND_SOC_SOF_COMETLAKE:
 CONFIG_SND_SOC_SOF_COMETLAKE=m
-# CONFIG_SND_SOC_SOF_ELKHARTLAKE:
 CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
 CONFIG_SND_SOC_SOF_GEMINILAKE=m
 CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
 CONFIG_SND_SOC_SOF_HDA_LINK=y
-# CONFIG_SND_SOC_SOF_ICELAKE:
 CONFIG_SND_SOC_SOF_ICELAKE=m
 # CONFIG_SND_SOC_SOF_IMX8M_SUPPORT is not set
 # CONFIG_SND_SOC_SOF_IMX8_SUPPORT is not set
 # CONFIG_SND_SOC_SOF_IMX_TOPLEVEL is not set
-# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE:
 CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
 CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
-# CONFIG_SND_SOC_SOF_JASPERLAKE:
 CONFIG_SND_SOC_SOF_JASPERLAKE=m
 CONFIG_SND_SOC_SOF_KABYLAKE=m
-# CONFIG_SND_SOC_SOF_MERRIFIELD:
 CONFIG_SND_SOC_SOF_MERRIFIELD=m
 CONFIG_SND_SOC_SOF_METEORLAKE=m
 # CONFIG_SND_SOC_SOF_OF is not set
 CONFIG_SND_SOC_SOF_PCI=m
 CONFIG_SND_SOC_SOF_SKYLAKE=m
-# CONFIG_SND_SOC_SOF_TIGERLAKE:
 CONFIG_SND_SOC_SOF_TIGERLAKE=m
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 # CONFIG_SND_SOC_SPDIF is not set
@@ -6125,11 +6111,11 @@ CONFIG_SPI=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
 CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
@@ -7280,12 +7266,8 @@ CONFIG_XILINX_GMII2RGMII=m
 # CONFIG_XILLYBUS is not set
 # CONFIG_XILLYUSB is not set
 CONFIG_XMON_DEFAULT_RO_MODE=y
-# CONFIG_XZ_DEC_ARM ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_ARMTHUMB ignored for predicate CONFIG_EXPERT
-# CONFIG_XZ_DEC_IA64 ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_MICROLZMA is not set
 CONFIG_XZ_DEC_POWERPC=y
-# CONFIG_XZ_DEC_SPARC ignored for predicate CONFIG_EXPERT
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC=y
diff --git a/kernel.spec b/kernel.spec
index a33ca2d28..b3f7ad944 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -126,13 +126,13 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 6.2.0
 %define patchversion 6.2
-%define pkgrelease 0.rc6.20230201gitc0b67534c95c.47
+%define pkgrelease 0.rc6.20230202git9f266ccaa2f5.46
 %define kversion 6
-%define tarfile_release 6.2-rc6-11-gc0b67534c95c
+%define tarfile_release 6.2-rc6-50-g9f266ccaa2f5
 # This is needed to do merge window version magic
 %define patchlevel 2
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.20230201gitc0b67534c95c.47%{?buildid}%{?dist}
+%define specrelease 0.rc6.20230202git9f266ccaa2f5.46%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.2.0
 
@@ -635,7 +635,7 @@ BuildRequires: python3-docutils
 BuildRequires: zlib-devel binutils-devel
 %endif
 %if %{with_selftests}
-BuildRequires: clang llvm fuse-devel
+BuildRequires: clang llvm-devel fuse-devel
 %ifnarch %{arm}
 BuildRequires: numactl-devel
 %endif
@@ -850,7 +850,7 @@ Source2002: kvm_stat.logrotate
 # Some people enjoy building customized kernels from the dist-git in Fedora and
 # use this to override configuration options. One day they may all use the
 # source tree, but in the mean time we carry this to support the legacy workflow
-Source3000: merge.pl
+Source3000: merge.py
 Source3001: kernel-local
 %if %{patchlist_changelog}
 Source3002: Patchlist.changelog
@@ -1042,7 +1042,7 @@ This package provides debug information for package kernel-tools.
 %{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/gpio-watch(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|.*%%{_bindir}/intel-speed-select(\.debug)?|.*%%{_bindir}/page_owner_sort(\.debug)?|.*%%{_bindir}/slabinfo(\.debug)?|.*%%{_sbindir}/intel_sdsi(\.debug)?|XXX' -o kernel-tools-debuginfo.list}
 
 %package -n rtla
-Summary: RTLA: Real-Time Linux Analysis tools 
+Summary: RTLA: Real-Time Linux Analysis tools
 %description -n rtla
 The rtla tool is a meta-tool that includes a set of commands that
 aims to analyze the real-time properties of Linux. But, instead of
@@ -1513,7 +1513,7 @@ cd configs
 # Drop some necessary files from the source dir into the buildroot
 cp $RPM_SOURCE_DIR/kernel-*.config .
 cp %{SOURCE80} .
-# merge.pl
+# merge.py
 cp %{SOURCE3000} .
 # kernel-local
 cp %{SOURCE3001} .
@@ -1524,12 +1524,12 @@ FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh %{debu
 for i in %{all_arch_configs}
 do
   mv $i $i.tmp
-  ./merge.pl %{SOURCE3001} $i.tmp > $i
+  ./merge.py %{SOURCE3001} $i.tmp > $i
 %if %{with_gcov}
   echo "Merging with gcov options"
   cat %{SOURCE75}
   mv $i $i.tmp
-  ./merge.pl %{SOURCE75} $i.tmp > $i
+  ./merge.py %{SOURCE75} $i.tmp > $i
 %endif
   rm $i.tmp
 done
@@ -3220,11 +3220,21 @@ fi
 #
 #
 %changelog
-* Wed Feb 01 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc6.c0b67534c95c.46]
+* Thu Feb 02 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc6.9f266ccaa2f5.46]
+- redhat/configs: Enable CONFIG_SENSORS_LM90 for RHEL (Mark Salter)
+- Fix up SQUASHFS decompression configs (Justin M. Forbes)
+- redhat/configs: enable CONFIG_OCTEON_EP as a module in ARK (Michal Schmidt) [2041990]
+- redhat: ignore rpminspect runpath report on urandom_read selftest binaries (Herton R. Krzesinski)
+- kernel.spec: add llvm-devel build requirement (Scott Weaver)
 - Update self-test data to not expect debugbuildsenabled 0 (Justin M. Forbes)
 - Turn off forced debug builds (Justin M. Forbes)
 - Turn on debug builds for aarch64 Fedora (Justin M. Forbes)
+- redhat/configs:  modify merge.py to match old overrides input (Clark Williams)
+- redhat:  fixup pylint complaints (Clark Williams)
+- redhat: remove merge.pl and references to it (Clark Williams)
+- redhat: update merge.py to handle merge.pl corner cases (Clark Williams)
 - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus)
+- Linux v6.2.0-0.rc6.9f266ccaa2f5
 
 * Wed Feb 01 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc6.c0b67534c95c.45]
 - Update rebase notes for Fedora (Justin M. Forbes)
diff --git a/merge.pl b/merge.pl
deleted file mode 100755
index dbaf5927b..000000000
--- a/merge.pl
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /usr/bin/perl
-
-my @args=@ARGV;
-my %configvalues;
-my @configoptions;
-my $configcounter = 0;
-
-# optionally print out the architecture as the first line of our output
-my $arch = $args[2];
-if (defined $arch) {
-	print "# $arch\n";
-}
-
-# first, read the override file
-
-open (FILE,"$args[0]") || die "Could not open $args[0]";
-while (<FILE>) {
-	my $str = $_;
-	my $configname;
-
-	if (/\# ([\w]+) is not set/) {
-		$configname = $1;
-	} elsif (/^\#/) {
-		# fall through on comments like 'avoid CONFIG_FOO=y'
-		;
-	} elsif (/([\w]+)=/) {
-		$configname = $1;
-	}
-
-	if (defined($configname) && !exists($configvalues{$configname})) {
-		$configvalues{$configname} = $str;
-		$configoptions[$configcounter] = $configname;
-		$configcounter ++;
-	}
-};
-
-# now, read and output the entire configfile, except for the overridden
-# parts... for those the new value is printed.
-
-open (FILE2,"$args[1]") || die "Could not open $args[1]";
-while (<FILE2>) {
-	my $configname;
-
-	if (/\# ([\w]+) is not set/) {
-		$configname = $1;
-	} elsif (/^\#/) {
-		# fall through on comments like 'avoid CONFIG_FOO=y'
-		;
-	} elsif (/([\w]+)=/) {
-		$configname  = $1;
-	}
-
-	if (defined($configname) && exists($configvalues{$configname})) {
-		print "$configvalues{$configname}";
-		delete($configvalues{$configname});
-	} else {
-		print "$_";
-	}
-}
-
-# now print the new values from the overridden configfile
-my $counter = 0;
-
-while ($counter < $configcounter) {
-	my $configname = $configoptions[$counter];
-	if (exists($configvalues{$configname})) {
-		print "$configvalues{$configname}";
-	}
-	$counter++;
-}
-
-1;
diff --git a/merge.py b/merge.py
new file mode 100755
index 000000000..e1d0efdae
--- /dev/null
+++ b/merge.py
@@ -0,0 +1,84 @@
+#!/usr/bin/python3
+# SPDX-License-Identifier: GPL-2.0
+# Author: Clark Williams <williams@redhat.com>
+# Copyright (C) 2022 Red Hat, Inc.
+#
+# merge.py - a direct replacement for merge.pl in the redhat/configs directory
+#
+# invocation:   python merge.py overrides baseconfig [arch]
+#
+# This script merges two kernel configuration files, an override file and a
+# base config file and writes the results to stdout.
+#
+# The script reads the overrides into a dictionary, then reads the baseconfig
+# file, looking for overrides and replacing any found, then printing the result
+# to stdout. Finally any remaining (new) configs in the override are appended to the
+# end of the output
+
+import sys
+import re
+import os.path
+
+def usage(msg):
+    '''print a usage message and exit'''
+    sys.stderr.write(msg + "\n")
+    sys.stderr.write("usage: merge.py overrides baseconfig [arch]\n")
+    sys.exit(1)
+
+isset = re.compile(r'^(CONFIG_\w+)=')
+notset = re.compile(r'^#\s+(CONFIG_\w+)\s+is not set')
+
+# search an input line for a config (set or notset) pattern
+# if we get a match return the config that is being changed
+def find_config(line):
+    '''find a configuration line in the input and return the config name'''
+    if m := isset.match(line):
+        return m.group(1)
+    if m := notset.match(line):
+        return m.group(1)
+    return None
+
+#########################################################
+
+if len(sys.argv) < 3:
+    usage("must have two input files")
+
+override_file = sys.argv[1]
+baseconfig_file = sys.argv[2]
+
+if not os.path.exists(override_file):
+    usage(f"overrides config file {override_file: s} does not exist!")
+
+if not os.path.exists(baseconfig_file):
+    usage(f"base configs file {baseconfig_file: s} does not exist")
+
+if len(sys.argv) == 4:
+    print(f"# {sys.argv[3]:s}")
+
+# read each line of the override file and store any configuration values
+# in the overrides dictionary, keyed by the configuration name.
+overrides = {}
+with open(override_file, "rt", encoding="utf-8") as f:
+    for line in [l.strip() for l in f.readlines()]:
+        c = find_config(line)
+        if c and c not in overrides:
+            overrides[c] = line
+
+# now read and print the base config, checking each line
+# that defines a config value and printing the override if
+# it exists
+with open(baseconfig_file, "rt", encoding="utf-8") as f:
+    for line in [ l.strip() for l in f.readlines() ]:
+        c = find_config(line)
+        if c and c in overrides:
+            print(overrides[c])
+            del overrides[c]
+        else:
+            print(line)
+
+# print out the remaining configs (new values)
+# from the overrides file
+for v in overrides.values():
+    print (v)
+
+sys.exit(0)
diff --git a/rpminspect.yaml b/rpminspect.yaml
index 6904ba107..975356834 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -24,3 +24,8 @@ patches:
     ignore_list:
         - linux-kernel-test.patch
         - patch-6.2-redhat.patch
+
+runpath:
+    ignore:
+        - /usr/libexec/kselftests/bpf/urandom_read
+        - /usr/libexec/kselftests/bpf/no_alu32/urandom_read
diff --git a/sources b/sources
index 5131b1520..54a52a5a0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.2-rc6-11-gc0b67534c95c.tar.xz) = ebd2f51763c95637bab98fdcd11ba7539e027cbe0afb994f742599e6dd5b303b59f900fc6e23876e90d05064977f11473f9de7fec94424c5f527124f0668bfce
-SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 29b52154fe439067394ac45bbc50fc5947d26550aeff77c15ba8e2daa04352bc02b863aad7a76a980d6e6bfc3262547189240d65192b6d2135266fe0e581475e
-SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = b5e4e82ac289fd13312028ad1b1c13f4317e825def727e6872d338ce190ef4e565f48a7839e73a44b103816a8bdd3b3ffe3b3d662dd843146f51d2bb857dbf2b
+SHA512 (linux-6.2-rc6-50-g9f266ccaa2f5.tar.xz) = 2bc132285aeb3a4040afda2281a3fa5c2c250b5561a2c31b29fc6657f66bc95e2e9db34e6cf8271bf567bb86c96397577e76fc2ee61b2d3bf3c3d7501b97fc0a
+SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 63f7b3c24b7b3c38ed2b5deb10e8f16d58a717567ba83f2b7371343ee2a6282719029ce9edcb197959e04c2238261b8ba02af196ec49cfc6dc7aacc04082cf93
+SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = f408dba8507c48d8a6519617390458e6c14b8e4176700559e70ac74cd08353d47cbe59da1bb74d995b8d92893f2f76e271dca2cb5f09185f0f77bf705187e1f4