diff --git a/config/arm64/vanilla b/config/arm64/vanilla index c51681c..a26a127 100644 --- a/config/arm64/vanilla +++ b/config/arm64/vanilla @@ -1029,6 +1029,7 @@ CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set CONFIG_ZSWAP_EXCLUSIVE_LOADS=y +CONFIG_ZSWAP_NR_ZPOOLS_ORDER=0 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -7693,6 +7694,7 @@ CONFIG_DRM_MXS=y CONFIG_DRM_IMX_LCDIF=m CONFIG_DRM_MESON=m CONFIG_DRM_MESON_DW_HDMI=m +CONFIG_DRM_MESON_DW_MIPI_DSI=m # CONFIG_DRM_ARCPGU is not set CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m @@ -7739,6 +7741,9 @@ CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=y CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_IO_HELPERS=y +CONFIG_FB_SYS_HELPERS=y +CONFIG_FB_SYS_HELPERS_DEFERRED=y CONFIG_FB_BACKLIGHT=m CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y @@ -9822,7 +9827,6 @@ CONFIG_COMEDI=m CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 # CONFIG_COMEDI_MISC_DRIVERS is not set -# CONFIG_COMEDI_ISA_DRIVERS is not set # CONFIG_COMEDI_PCI_DRIVERS is not set CONFIG_COMEDI_USB_DRIVERS=m CONFIG_COMEDI_DT9812=m diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla index 3e531d1..ec73332 100644 --- a/config/armv7hl/vanilla +++ b/config/armv7hl/vanilla @@ -1093,6 +1093,7 @@ CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set CONFIG_ZSWAP_EXCLUSIVE_LOADS=y +CONFIG_ZSWAP_NR_ZPOOLS_ORDER=0 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -7493,6 +7494,7 @@ CONFIG_DRM_MXSFB=m CONFIG_DRM_IMX_LCDIF=m CONFIG_DRM_MESON=m CONFIG_DRM_MESON_DW_HDMI=m +CONFIG_DRM_MESON_DW_MIPI_DSI=m # CONFIG_DRM_ARCPGU is not set # CONFIG_DRM_BOCHS is not set # CONFIG_DRM_CIRRUS_QEMU is not set @@ -7540,6 +7542,9 @@ CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=y CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_IO_HELPERS=y +CONFIG_FB_SYS_HELPERS=y +CONFIG_FB_SYS_HELPERS_DEFERRED=y CONFIG_FB_BACKLIGHT=m CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y diff --git a/config/i386/vanilla b/config/i386/vanilla index 846d702..90ac706 100644 --- a/config/i386/vanilla +++ b/config/i386/vanilla @@ -1036,6 +1036,7 @@ CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set CONFIG_ZSWAP_EXCLUSIVE_LOADS=y +CONFIG_ZSWAP_NR_ZPOOLS_ORDER=0 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -6912,6 +6913,9 @@ CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=y CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_IO_HELPERS=y +CONFIG_FB_SYS_HELPERS=y +CONFIG_FB_SYS_HELPERS_DEFERRED=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla index ca21593..933a0e7 100644 --- a/config/ppc64/vanilla +++ b/config/ppc64/vanilla @@ -865,6 +865,7 @@ CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set CONFIG_ZSWAP_EXCLUSIVE_LOADS=y +CONFIG_ZSWAP_NR_ZPOOLS_ORDER=0 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -6191,6 +6192,9 @@ CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=y CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_IO_HELPERS=y +CONFIG_FB_SYS_HELPERS=y +CONFIG_FB_SYS_HELPERS_DEFERRED=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla index 30e09c6..1a54211 100644 --- a/config/ppc64le/vanilla +++ b/config/ppc64le/vanilla @@ -821,6 +821,7 @@ CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set CONFIG_ZSWAP_EXCLUSIVE_LOADS=y +CONFIG_ZSWAP_NR_ZPOOLS_ORDER=0 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -6072,6 +6073,9 @@ CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=y CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_IO_HELPERS=y +CONFIG_FB_SYS_HELPERS=y +CONFIG_FB_SYS_HELPERS_DEFERRED=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y diff --git a/config/riscv64/vanilla b/config/riscv64/vanilla index 0c1430b..d092fa9 100644 --- a/config/riscv64/vanilla +++ b/config/riscv64/vanilla @@ -710,6 +710,7 @@ CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set CONFIG_ZSWAP_EXCLUSIVE_LOADS=y +CONFIG_ZSWAP_NR_ZPOOLS_ORDER=0 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -6396,6 +6397,9 @@ CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=y CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_IO_HELPERS=y +CONFIG_FB_SYS_HELPERS=y +CONFIG_FB_SYS_HELPERS_DEFERRED=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y @@ -6738,6 +6742,8 @@ CONFIG_SND_SOC_MTK_BTCVSD=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_OF=m +CONFIG_SND_SOC_STARFIVE=m +CONFIG_SND_SOC_JH7110_TDM=m # # STMicroelectronics STM32 SOC audio support diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla index 1eb4316..3d44249 100644 --- a/config/x86_64/vanilla +++ b/config/x86_64/vanilla @@ -1071,6 +1071,7 @@ CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set CONFIG_ZSWAP_EXCLUSIVE_LOADS=y +CONFIG_ZSWAP_NR_ZPOOLS_ORDER=0 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -6739,6 +6740,9 @@ CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=y CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_IO_HELPERS=y +CONFIG_FB_SYS_HELPERS=y +CONFIG_FB_SYS_HELPERS_DEFERRED=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y diff --git a/rpm/config.sh b/rpm/config.sh index 573675e..7a3a8b9 100644 --- a/rpm/config.sh +++ b/rpm/config.sh @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=6.4-rc4-next-20230601 +SRCVERSION=6.4-rc4-next-20230602 # variant of the kernel-source package, either empty or "-rt" VARIANT=-vanilla # Set to 1 to use the variant kernel for kernel-obs-build