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-s390x-fedora.config | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'kernel-s390x-fedora.config') diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index aa7191bd5..d83fdb95b 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1305,6 +1305,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 @@ -2878,6 +2879,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_ZSTD is not set CONFIG_KEXEC_FILE=y +# CONFIG_KEXEC_IMAGE_VERIFY_SIG: CONFIG_KEXEC_IMAGE_VERIFY_SIG=y # CONFIG_KEXEC_SIG_FORCE is not set CONFIG_KEXEC_SIG=y @@ -4029,7 +4031,7 @@ CONFIG_NET_VENDOR_LITEX=y CONFIG_NET_VENDOR_MELLANOX=y # CONFIG_NET_VENDOR_MICREL is not set # 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 is not set # CONFIG_NET_VENDOR_NATSEMI is not set @@ -4223,6 +4225,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 @@ -5826,6 +5829,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 @@ -6136,12 +6140,14 @@ 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 @@ -7198,6 +7204,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 @@ -7531,6 +7538,7 @@ CONFIG_WINBOND_840=m # CONFIG_WIREGUARD_DEBUG is not set CONFIG_WIREGUARD=m # CONFIG_WIRELESS_EXT is not set +# CONFIG_WIRELESS_HOTKEY: CONFIG_WIRELESS_HOTKEY=m CONFIG_WIRELESS=y CONFIG_WIZNET_BUS_ANY=y -- cgit