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, 23 insertions, 1 deletions

diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index d7503e7bb..fea339c8e 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1421,6 +1421,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
@@ -3192,6 +3193,7 @@ CONFIG_KDB_KEYBOARD=y
 CONFIG_KERNEL_ZSTD=y
 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
@@ -4376,7 +4378,7 @@ CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_MICROSEMI is not set 
+# CONFIG_NET_VENDOR_MICROSEMI is not set
 CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_NET_VENDOR_NATSEMI=y
@@ -4574,6 +4576,7 @@ CONFIG_N_HDLC=m
 CONFIG_NIC7018_WDT=m
 CONFIG_NILFS2_FS=m
 CONFIG_NINTENDO_FF=y
+# CONFIG_NITRO_ENCLAVES:
 CONFIG_NITRO_ENCLAVES=m
 # CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
 CONFIG_NIU=m
@@ -6276,6 +6279,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
@@ -6602,46 +6606,61 @@ 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_SC8280XP is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 CONFIG_SND_SOC_SIMPLE_MUX=m
+# 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_REMBRANDT is not set
 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_IMX8ULP 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
@@ -7124,6 +7143,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=y
 # CONFIG_TI_ADC081C is not set
@@ -7691,6 +7711,7 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VL600=m
 CONFIG_USB_WDM=m
 # CONFIG_USB_XEN_HCD is not set
+# CONFIG_USB_XEN_HCD=m
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
@@ -8034,6 +8055,7 @@ CONFIG_WINMATE_FM07_KEYS=m
 # CONFIG_WIREGUARD_DEBUG is not set
 CONFIG_WIREGUARD=m
 CONFIG_WIRELESS_EXT=y
+# CONFIG_WIRELESS_HOTKEY:
 CONFIG_WIRELESS_HOTKEY=m
 CONFIG_WIRELESS=y
 CONFIG_WIZNET_BUS_ANY=y