kernel-6.1.0-0.rc2.20221028git23758867219c.24

* Fri Oct 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.23758867219c.24]
- redhat: method.py: change the output loop to use 'values' method (Patrick Talbert)
- redhat: use 'update' method in merge.py (Patrick Talbert)
- redhat: Use a context manager in merge.py for opening the config file for reading (Patrick Talbert)
- redhat: automatically strip newlines in merge.py (Clark Williams)
- redhat: python replacement for merge.pl (Clark Williams)
- Linux v6.1.0-0.rc2.23758867219c
Resolves:

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

1 files changed, 26 insertions, 0 deletions

diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 0088902fb..92870a0f1 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -863,6 +863,7 @@ 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
@@ -1233,6 +1234,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
+# CONFIG_DMA_PERNUMA_CMA:
 # CONFIG_DMA_PERNUMA_CMA is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@@ -2784,6 +2786,7 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_ZSTD is not set
 CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
 CONFIG_KEXEC_FILE=y
+# CONFIG_KEXEC_IMAGE_VERIFY_SIG:
 CONFIG_KEXEC_IMAGE_VERIFY_SIG=y
 CONFIG_KEXEC_JUMP=y
 # CONFIG_KEXEC_SIG_FORCE is not set
@@ -3969,6 +3972,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
+# CONFIG_NITRO_ENCLAVES:
 CONFIG_NITRO_ENCLAVES=m
 CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
 # CONFIG_NL80211_TESTMODE is not set
@@ -5504,6 +5508,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL_BYT_PREFER_SOF:
 # CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK_INJECTION_DEBUG=y
@@ -5824,41 +5829,56 @@ CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811 is not set
 # CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF is not set
 # CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994 is not set
+# CONFIG_SND_SOC_SC7180:
 # CONFIG_SND_SOC_SC7180 is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
+# CONFIG_SND_SOC_SM8250:
 # CONFIG_SND_SOC_SM8250 is not set
 # 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
@@ -6303,6 +6323,7 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
 CONFIG_THINKPAD_ACPI_VIDEO=y
+# CONFIG_THINKPAD_LMI:
 CONFIG_THINKPAD_LMI=m
 # CONFIG_THRUSTMASTER_FF is not set
 CONFIG_THUNDERX2_PMU=m
@@ -7075,6 +7096,7 @@ CONFIG_WDAT_WDT=m
 # CONFIG_WINMATE_FM07_KEYS is not set
 # CONFIG_WIREGUARD_DEBUG is not set
 CONFIG_WIREGUARD=m
+# CONFIG_WIRELESS_HOTKEY:
 CONFIG_WIRELESS_HOTKEY=m
 CONFIG_WIRELESS=y
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
@@ -7222,8 +7244,12 @@ 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