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

diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 4c3f5272b..c34c77391 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -1682,6 +1682,7 @@ CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_DMA_OF=y
 CONFIG_DMA_OMAP=m
+# CONFIG_DMA_PERNUMA_CMA:
 # CONFIG_DMA_PERNUMA_CMA is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@@ -2186,6 +2187,7 @@ CONFIG_ET131X=m
 CONFIG_ETHERNET=y
 CONFIG_ETHOC=m
 CONFIG_ETHTOOL_NETLINK=y
+# CONFIG_ETM4X_IMPDEF_FEATURE:
 # CONFIG_ETM4X_IMPDEF_FEATURE is not set
 # CONFIG_EUROTECH_WDT is not set
 # CONFIG_EVM_ADD_XATTRS is not set
@@ -3524,6 +3526,7 @@ CONFIG_KERNEL_MODE_NEON=y
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_ZSTD is not set
 # CONFIG_KEXEC_FILE is not set
+# CONFIG_KEXEC_IMAGE_VERIFY_SIG:
 CONFIG_KEXEC_IMAGE_VERIFY_SIG=y
 CONFIG_KEXEC_SIG=y
 CONFIG_KEXEC=y
@@ -4826,7 +4829,7 @@ CONFIG_NET_VENDOR_MARVELL=y
 # CONFIG_NET_VENDOR_MELLANOX is not set
 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
@@ -5020,6 +5023,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NI903X_WDT is not set
 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
@@ -7071,6 +7075,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
+# 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
@@ -7394,6 +7399,7 @@ CONFIG_SND_SOC_SAMSUNG=m
 CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
 CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
 CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
+# CONFIG_SND_SOC_SC7180:
 # CONFIG_SND_SOC_SC7180 is not set
 # CONFIG_SND_SOC_SC7280 is not set
 # CONFIG_SND_SOC_SC8280XP is not set
@@ -7401,6 +7407,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 CONFIG_SND_SOC_SGTL5000=m
 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=m
 CONFIG_SND_SOC_SNOW=m
@@ -8707,6 +8714,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
@@ -9104,6 +9112,7 @@ CONFIG_WINBOND_840=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