From 62963684344d902de2f59b12b49bbddc0dbf10ea Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 28 Oct 2022 12:48:22 -0500 Subject: kernel-6.1.0-0.rc2.20221028git23758867219c.24 * Fri Oct 28 2022 Fedora Kernel Team [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 --- kernel-armv7hl-fedora.config | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'kernel-armv7hl-fedora.config') diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 407770f26..35aa3e74e 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1675,6 +1675,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 @@ -2179,6 +2180,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 @@ -3507,6 +3509,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 @@ -4808,7 +4811,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 @@ -5002,6 +5005,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 @@ -7052,6 +7056,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 is not set @@ -7374,6 +7379,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 @@ -7381,6 +7387,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 @@ -8686,6 +8693,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 @@ -9083,6 +9091,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 -- cgit