From d6cbdaa78bfe1ecf6aa6a95e743bcba390a2ae93 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Sun, 3 Jan 2021 03:24:08 +0100 Subject: force futex2 futex 2 dependend on EXPERT being set before being configured. Since we don't want to deal with the 30 new configuration values that enabling EXPERT allows configuring we are just going to force it on by default via the patch --- SOURCES/futex2.patch | 2 +- SOURCES/kernel-aarch64-debug-fedora.config | 3 ++- SOURCES/kernel-aarch64-debug-rhel.config | 3 ++- SOURCES/kernel-aarch64-fedora.config | 3 ++- SOURCES/kernel-aarch64-rhel.config | 3 ++- SOURCES/kernel-armv7hl-debug-fedora.config | 3 ++- SOURCES/kernel-armv7hl-fedora.config | 3 ++- SOURCES/kernel-armv7hl-lpae-debug-fedora.config | 3 ++- SOURCES/kernel-armv7hl-lpae-fedora.config | 3 ++- SOURCES/kernel-i686-debug-fedora.config | 3 ++- SOURCES/kernel-i686-fedora.config | 3 ++- SOURCES/kernel-ppc64le-debug-fedora.config | 3 ++- SOURCES/kernel-ppc64le-debug-rhel.config | 3 ++- SOURCES/kernel-ppc64le-fedora.config | 3 ++- SOURCES/kernel-ppc64le-rhel.config | 3 ++- SOURCES/kernel-s390x-debug-fedora.config | 3 ++- SOURCES/kernel-s390x-debug-rhel.config | 3 ++- SOURCES/kernel-s390x-fedora.config | 3 ++- SOURCES/kernel-s390x-rhel.config | 3 ++- SOURCES/kernel-s390x-zfcpdump-rhel.config | 3 ++- SOURCES/kernel-x86_64-debug-fedora.config | 3 ++- SOURCES/kernel-x86_64-debug-rhel.config | 3 ++- SOURCES/kernel-x86_64-fedora.config | 3 ++- SOURCES/kernel-x86_64-rhel.config | 3 ++- SPECS/kernel.spec | 5 ++++- 25 files changed, 51 insertions(+), 25 deletions(-) diff --git a/SOURCES/futex2.patch b/SOURCES/futex2.patch index bfd12ba..bae4138 100644 --- a/SOURCES/futex2.patch +++ b/SOURCES/futex2.patch @@ -160,7 +160,7 @@ index 2a5df1cf838c..440f21f5c3d8 100644 +config FUTEX2 + bool "Enable futex2 support" if EXPERT + depends on FUTEX -+ default n ++ default y + help + Experimental support for futex2 interface. + diff --git a/SOURCES/kernel-aarch64-debug-fedora.config b/SOURCES/kernel-aarch64-debug-fedora.config index d2db6db..8ff33f4 100644 --- a/SOURCES/kernel-aarch64-debug-fedora.config +++ b/SOURCES/kernel-aarch64-debug-fedora.config @@ -2145,6 +2145,8 @@ CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y CONFIG_FW_CACHE=y # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=m @@ -8005,4 +8007,3 @@ CONFIG_ZYNQMP_POWER=y # This option determines the default init for the system if no init= # warnings from C=1 sparse checker or -Wextra compilations. It has CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-aarch64-debug-rhel.config b/SOURCES/kernel-aarch64-debug-rhel.config index f561a09..f64baeb 100644 --- a/SOURCES/kernel-aarch64-debug-rhel.config +++ b/SOURCES/kernel-aarch64-debug-rhel.config @@ -1644,6 +1644,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y @@ -6271,4 +6273,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set # CONFIG_ZX_TDM is not set CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-aarch64-fedora.config b/SOURCES/kernel-aarch64-fedora.config index 315fe3b..dcf5b44 100644 --- a/SOURCES/kernel-aarch64-fedora.config +++ b/SOURCES/kernel-aarch64-fedora.config @@ -2129,6 +2129,8 @@ CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y CONFIG_FW_CACHE=y # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=m @@ -7983,4 +7985,3 @@ CONFIG_ZYNQMP_POWER=y # This option determines the default init for the system if no init= # warnings from C=1 sparse checker or -Wextra compilations. It has CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-aarch64-rhel.config b/SOURCES/kernel-aarch64-rhel.config index 2467e8a..ac5767c 100644 --- a/SOURCES/kernel-aarch64-rhel.config +++ b/SOURCES/kernel-aarch64-rhel.config @@ -1628,6 +1628,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y @@ -6250,4 +6252,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set # CONFIG_ZX_TDM is not set CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-armv7hl-debug-fedora.config b/SOURCES/kernel-armv7hl-debug-fedora.config index 3444a4f..a017d14 100644 --- a/SOURCES/kernel-armv7hl-debug-fedora.config +++ b/SOURCES/kernel-armv7hl-debug-fedora.config @@ -2170,6 +2170,8 @@ CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y CONFIG_FW_CACHE=y # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=m @@ -8303,4 +8305,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # This option determines the default init for the system if no init= # warnings from C=1 sparse checker or -Wextra compilations. It has CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-armv7hl-fedora.config b/SOURCES/kernel-armv7hl-fedora.config index b9a45ce..c808268 100644 --- a/SOURCES/kernel-armv7hl-fedora.config +++ b/SOURCES/kernel-armv7hl-fedora.config @@ -2155,6 +2155,8 @@ CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y CONFIG_FW_CACHE=y # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=m @@ -8282,4 +8284,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # This option determines the default init for the system if no init= # warnings from C=1 sparse checker or -Wextra compilations. It has CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config index 2b3bf22..d02b455 100644 --- a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config +++ b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config @@ -2122,6 +2122,8 @@ CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y CONFIG_FW_CACHE=y # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=m @@ -8028,4 +8030,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # This option determines the default init for the system if no init= # warnings from C=1 sparse checker or -Wextra compilations. It has CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-armv7hl-lpae-fedora.config b/SOURCES/kernel-armv7hl-lpae-fedora.config index bdd814f..d2ea177 100644 --- a/SOURCES/kernel-armv7hl-lpae-fedora.config +++ b/SOURCES/kernel-armv7hl-lpae-fedora.config @@ -2107,6 +2107,8 @@ CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y CONFIG_FW_CACHE=y # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=m @@ -8007,4 +8009,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # This option determines the default init for the system if no init= # warnings from C=1 sparse checker or -Wextra compilations. It has CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-i686-debug-fedora.config b/SOURCES/kernel-i686-debug-fedora.config index b22c446..adf894c 100644 --- a/SOURCES/kernel-i686-debug-fedora.config +++ b/SOURCES/kernel-i686-debug-fedora.config @@ -1867,6 +1867,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y CONFIG_FW_CACHE=y # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=m @@ -7329,4 +7331,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # This option determines the default init for the system if no init= # warnings from C=1 sparse checker or -Wextra compilations. It has CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-i686-fedora.config b/SOURCES/kernel-i686-fedora.config index 0b6f96f..63ea3c0 100644 --- a/SOURCES/kernel-i686-fedora.config +++ b/SOURCES/kernel-i686-fedora.config @@ -1850,6 +1850,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y CONFIG_FW_CACHE=y # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=m @@ -7307,4 +7309,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # This option determines the default init for the system if no init= # warnings from C=1 sparse checker or -Wextra compilations. It has CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-ppc64le-debug-fedora.config b/SOURCES/kernel-ppc64le-debug-fedora.config index bd9a95c..45d0ec9 100644 --- a/SOURCES/kernel-ppc64le-debug-fedora.config +++ b/SOURCES/kernel-ppc64le-debug-fedora.config @@ -1710,6 +1710,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y CONFIG_FW_CACHE=y # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=m @@ -6805,4 +6807,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # This option determines the default init for the system if no init= # warnings from C=1 sparse checker or -Wextra compilations. It has CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-ppc64le-debug-rhel.config b/SOURCES/kernel-ppc64le-debug-rhel.config index 3b9dab5..8ece03b 100644 --- a/SOURCES/kernel-ppc64le-debug-rhel.config +++ b/SOURCES/kernel-ppc64le-debug-rhel.config @@ -1519,6 +1519,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y @@ -6118,4 +6120,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set # CONFIG_ZX_TDM is not set CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-ppc64le-fedora.config b/SOURCES/kernel-ppc64le-fedora.config index 566913b..6ac8382 100644 --- a/SOURCES/kernel-ppc64le-fedora.config +++ b/SOURCES/kernel-ppc64le-fedora.config @@ -1693,6 +1693,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y CONFIG_FW_CACHE=y # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=m @@ -6782,4 +6784,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # This option determines the default init for the system if no init= # warnings from C=1 sparse checker or -Wextra compilations. It has CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-ppc64le-rhel.config b/SOURCES/kernel-ppc64le-rhel.config index b56545f..e680cac 100644 --- a/SOURCES/kernel-ppc64le-rhel.config +++ b/SOURCES/kernel-ppc64le-rhel.config @@ -1503,6 +1503,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y @@ -6100,4 +6102,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set # CONFIG_ZX_TDM is not set CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-s390x-debug-fedora.config b/SOURCES/kernel-s390x-debug-fedora.config index 267ed16..389479a 100644 --- a/SOURCES/kernel-s390x-debug-fedora.config +++ b/SOURCES/kernel-s390x-debug-fedora.config @@ -1708,6 +1708,8 @@ CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y CONFIG_FW_CACHE=y # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=m @@ -6745,4 +6747,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # This option determines the default init for the system if no init= # warnings from C=1 sparse checker or -Wextra compilations. It has CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-s390x-debug-rhel.config b/SOURCES/kernel-s390x-debug-rhel.config index eefa1c8..46f1bf3 100644 --- a/SOURCES/kernel-s390x-debug-rhel.config +++ b/SOURCES/kernel-s390x-debug-rhel.config @@ -1518,6 +1518,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y @@ -6071,4 +6073,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set # CONFIG_ZX_TDM is not set CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-s390x-fedora.config b/SOURCES/kernel-s390x-fedora.config index 8c33593..ad47c66 100644 --- a/SOURCES/kernel-s390x-fedora.config +++ b/SOURCES/kernel-s390x-fedora.config @@ -1691,6 +1691,8 @@ CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y CONFIG_FW_CACHE=y # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=m @@ -6722,4 +6724,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # This option determines the default init for the system if no init= # warnings from C=1 sparse checker or -Wextra compilations. It has CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-s390x-rhel.config b/SOURCES/kernel-s390x-rhel.config index 37522ae..07178f5 100644 --- a/SOURCES/kernel-s390x-rhel.config +++ b/SOURCES/kernel-s390x-rhel.config @@ -1502,6 +1502,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y @@ -6053,4 +6055,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set # CONFIG_ZX_TDM is not set CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-s390x-zfcpdump-rhel.config b/SOURCES/kernel-s390x-zfcpdump-rhel.config index 20a04e0..6a7d771 100644 --- a/SOURCES/kernel-s390x-zfcpdump-rhel.config +++ b/SOURCES/kernel-s390x-zfcpdump-rhel.config @@ -1514,6 +1514,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y @@ -6089,4 +6091,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set # CONFIG_ZX_TDM is not set CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-x86_64-debug-fedora.config b/SOURCES/kernel-x86_64-debug-fedora.config index f654ea8..b640625 100644 --- a/SOURCES/kernel-x86_64-debug-fedora.config +++ b/SOURCES/kernel-x86_64-debug-fedora.config @@ -1902,6 +1902,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y CONFIG_FW_CACHE=y # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=m @@ -7381,4 +7383,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # This option determines the default init for the system if no init= # warnings from C=1 sparse checker or -Wextra compilations. It has CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-x86_64-debug-rhel.config b/SOURCES/kernel-x86_64-debug-rhel.config index bd45aae..7c609b9 100644 --- a/SOURCES/kernel-x86_64-debug-rhel.config +++ b/SOURCES/kernel-x86_64-debug-rhel.config @@ -1627,6 +1627,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y @@ -6403,4 +6405,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set # CONFIG_ZX_TDM is not set CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-x86_64-fedora.config b/SOURCES/kernel-x86_64-fedora.config index e4797db..4e2638d 100644 --- a/SOURCES/kernel-x86_64-fedora.config +++ b/SOURCES/kernel-x86_64-fedora.config @@ -1885,6 +1885,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y CONFIG_FW_CACHE=y # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=m @@ -7359,4 +7361,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # This option determines the default init for the system if no init= # warnings from C=1 sparse checker or -Wextra compilations. It has CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SOURCES/kernel-x86_64-rhel.config b/SOURCES/kernel-x86_64-rhel.config index 09ede4d..59ed29f 100644 --- a/SOURCES/kernel-x86_64-rhel.config +++ b/SOURCES/kernel-x86_64-rhel.config @@ -1611,6 +1611,8 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_SPI=m CONFIG_FUSION=y CONFIG_FUTEX=y +# FUTEX2 is forced on via patch, config value is ignored +CONFIG_FUTEX2=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y @@ -6383,4 +6385,3 @@ CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y # CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set # CONFIG_ZX_TDM is not set CONFIG_ZENIFY=y -CONFIG_FUTEX2=y diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index f3ea893..60692d4 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -82,7 +82,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 201 +%global baserelease 202 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2975,6 +2975,9 @@ fi # # %changelog +* Sun Jan 3 03:24:01 CET 2021 Jan Drögehoff - 5.9.16-202.fsync +- force futex2 + * Sun Dec 27 22:03:29 CET 2020 Jan Drögehoff - 5.9.16-201.fsync - Linux v5.9.16 futex2 zen -- cgit v1.2.3