diff options
28 files changed, 133 insertions, 77 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index b04cb77d9..18afd0195 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 12 +RHEL_RELEASE = 13 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 8a16482fc..d9f61b6de 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/07dabbf6bfada8b964005e573d2a48323e4e0c9c - 07dabbf6bfada8b964005e573d2a48323e4e0c9c Fix the perf trace link location +https://gitlab.com/cki-project/kernel-ark/-/commit/eeeb30f378c606dff8ef7823e6ab0af0f041657f + eeeb30f378c606dff8ef7823e6ab0af0f041657f Fix the perf trace link location -https://gitlab.com/cki-project/kernel-ark/-/commit/b677d674288dc553c5832cb1c898d00617846ecc - b677d674288dc553c5832cb1c898d00617846ecc drm/amdgpu/dc: Really fix DCN3.1 Makefile for PPC64 +https://gitlab.com/cki-project/kernel-ark/-/commit/3cecd9812d297c5653678c5e84e2a9ab9daf4819 + 3cecd9812d297c5653678c5e84e2a9ab9daf4819 drm/amdgpu/dc: Really fix DCN3.1 Makefile for PPC64 https://gitlab.com/cki-project/kernel-ark/-/commit/c86a777b719e3777a9663a13a739840fb48a20ef c86a777b719e3777a9663a13a739840fb48a20ef Revert "kdump: add support for crashkernel=auto" diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 3357f4604..f504e84ab 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -615,6 +615,7 @@ CONFIG_BATTERY_GOLDFISH=m CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_MAX17042=m # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set CONFIG_BATTERY_SBS=m CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m @@ -2646,6 +2647,7 @@ CONFIG_HW_RANDOM_XGENE=m CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK_QCOM=m +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set # CONFIG_HYPERV_TESTING is not set @@ -8392,6 +8394,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 9e0255981..7be37ef2a 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -431,6 +431,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set @@ -1605,7 +1606,7 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_EVENT_TRACING=y # CONFIG_EVM_ADD_XATTRS is not set CONFIG_EVM_ATTR_FSUUID=y -CONFIG_EVM_LOAD_X509=y +# CONFIG_EVM_LOAD_X509 is not set CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" @@ -2269,7 +2270,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set -CONFIG_IMA_LOAD_X509=y +# CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 # CONFIG_IMA_NG_TEMPLATE is not set @@ -2278,7 +2279,6 @@ CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y # CONFIG_IMA_WRITE_POLICY is not set -CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der" CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set @@ -2315,7 +2315,7 @@ CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IRDMA is not set +CONFIG_INFINIBAND_IRDMA=m CONFIG_INFINIBAND_ISER=m CONFIG_INFINIBAND_ISERT=m CONFIG_INFINIBAND=m @@ -6629,6 +6629,7 @@ CONFIG_WAN=y # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 0e7c18f4d..76f435fa9 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -615,6 +615,7 @@ CONFIG_BATTERY_GOLDFISH=m CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_MAX17042=m # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set CONFIG_BATTERY_SBS=m CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m @@ -2630,6 +2631,7 @@ CONFIG_HW_RANDOM_XGENE=m CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK_QCOM=m +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set # CONFIG_HYPERV_TESTING is not set @@ -8367,6 +8369,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index b1b3d9786..d44033d91 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -431,6 +431,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set @@ -1597,7 +1598,7 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_EVENT_TRACING=y # CONFIG_EVM_ADD_XATTRS is not set CONFIG_EVM_ATTR_FSUUID=y -CONFIG_EVM_LOAD_X509=y +# CONFIG_EVM_LOAD_X509 is not set CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" @@ -2253,7 +2254,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set -CONFIG_IMA_LOAD_X509=y +# CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 # CONFIG_IMA_NG_TEMPLATE is not set @@ -2262,7 +2263,6 @@ CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y # CONFIG_IMA_WRITE_POLICY is not set -CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der" CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set @@ -2299,7 +2299,7 @@ CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IRDMA is not set +CONFIG_INFINIBAND_IRDMA=m CONFIG_INFINIBAND_ISER=m CONFIG_INFINIBAND_ISERT=m CONFIG_INFINIBAND=m @@ -6606,6 +6606,7 @@ CONFIG_WAN=y # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index e4d70e564..f73eaf6ee 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -639,6 +639,7 @@ CONFIG_BATTERY_MAX17040=m # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_OLPC=m +# CONFIG_BATTERY_RT5033 is not set CONFIG_BATTERY_RX51=m CONFIG_BATTERY_SBS=m CONFIG_BATTERY_SURFACE=m @@ -2673,6 +2674,7 @@ CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK_OMAP=m CONFIG_HWSPINLOCK_QCOM=m # CONFIG_HWSPINLOCK_STM32 is not set +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set # CONFIG_HYPERV_TESTING is not set @@ -8677,6 +8679,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 70d1d259a..f1f30e0d2 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -639,6 +639,7 @@ CONFIG_BATTERY_MAX17040=m # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_OLPC=m +# CONFIG_BATTERY_RT5033 is not set CONFIG_BATTERY_RX51=m CONFIG_BATTERY_SBS=m CONFIG_BATTERY_SURFACE=m @@ -2658,6 +2659,7 @@ CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK_OMAP=m CONFIG_HWSPINLOCK_QCOM=m # CONFIG_HWSPINLOCK_STM32 is not set +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set # CONFIG_HYPERV_TESTING is not set @@ -8653,6 +8655,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index a8a043532..370eefcfa 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -619,6 +619,7 @@ CONFIG_BATTERY_GOLDFISH=m CONFIG_BATTERY_MAX17040=m # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set CONFIG_BATTERY_SBS=m CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m @@ -2617,6 +2618,7 @@ CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK_OMAP=m # CONFIG_HWSPINLOCK_STM32 is not set +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set # CONFIG_HYPERV_TESTING is not set @@ -8408,6 +8410,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index dfe37a7a1..cdb6be925 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -619,6 +619,7 @@ CONFIG_BATTERY_GOLDFISH=m CONFIG_BATTERY_MAX17040=m # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set CONFIG_BATTERY_SBS=m CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m @@ -2602,6 +2603,7 @@ CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK_OMAP=m # CONFIG_HWSPINLOCK_STM32 is not set +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set # CONFIG_HYPERV_TESTING is not set @@ -8384,6 +8386,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 6f9c5e865..a0ad42984 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -464,6 +464,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_OLPC=y +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m @@ -2310,6 +2311,7 @@ CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set CONFIG_HYPERV_BALLOON=m @@ -7533,6 +7535,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 58a96d258..b3bdd4cd4 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -463,6 +463,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_OLPC=y +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m @@ -2293,6 +2294,7 @@ CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set CONFIG_HYPERV_BALLOON=m @@ -7509,6 +7511,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index e6ff8bfaf..08ca6088d 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -423,6 +423,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m @@ -2154,6 +2155,7 @@ CONFIG_HW_RANDOM_TPM=y CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set # CONFIG_HYPERV_TESTING is not set @@ -7110,6 +7112,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 3b8c61ee3..967c0e1b6 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -319,6 +319,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set @@ -1441,7 +1442,7 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_EVENT_TRACING=y # CONFIG_EVM_ADD_XATTRS is not set CONFIG_EVM_ATTR_FSUUID=y -CONFIG_EVM_LOAD_X509=y +# CONFIG_EVM_LOAD_X509 is not set CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" @@ -2094,7 +2095,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set -CONFIG_IMA_LOAD_X509=y +# CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 # CONFIG_IMA_NG_TEMPLATE is not set @@ -2104,7 +2105,6 @@ CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y # CONFIG_IMA_WRITE_POLICY is not set -CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der" CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set @@ -2140,7 +2140,7 @@ CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IRDMA is not set +CONFIG_INFINIBAND_IRDMA=m CONFIG_INFINIBAND_ISER=m CONFIG_INFINIBAND_ISERT=m CONFIG_INFINIBAND=m @@ -6394,6 +6394,7 @@ CONFIG_WAN=y # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 30517074f..8f0b1b41a 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -422,6 +422,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m @@ -2137,6 +2138,7 @@ CONFIG_HW_RANDOM_TPM=y CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set # CONFIG_HYPERV_TESTING is not set @@ -7085,6 +7087,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 583f4a087..8b379964b 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -319,6 +319,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set @@ -1433,7 +1434,7 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_EVENT_TRACING=y # CONFIG_EVM_ADD_XATTRS is not set CONFIG_EVM_ATTR_FSUUID=y -CONFIG_EVM_LOAD_X509=y +# CONFIG_EVM_LOAD_X509 is not set CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" @@ -2078,7 +2079,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set -CONFIG_IMA_LOAD_X509=y +# CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 # CONFIG_IMA_NG_TEMPLATE is not set @@ -2088,7 +2089,6 @@ CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y # CONFIG_IMA_WRITE_POLICY is not set -CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der" CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set @@ -2124,7 +2124,7 @@ CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IRDMA is not set +CONFIG_INFINIBAND_IRDMA=m CONFIG_INFINIBAND_ISER=m CONFIG_INFINIBAND_ISERT=m CONFIG_INFINIBAND=m @@ -6375,6 +6375,7 @@ CONFIG_WAN=y # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 770ce449d..9f72042cd 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -427,6 +427,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m @@ -2145,6 +2146,7 @@ CONFIG_HW_RANDOM_TPM=y CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set # CONFIG_HYPERV_TESTING is not set @@ -7076,6 +7078,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_DYNAMIC_STACK is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 1334e230f..a95535192 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -319,6 +319,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set @@ -1446,7 +1447,7 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_EVENT_TRACING=y # CONFIG_EVM_ADD_XATTRS is not set CONFIG_EVM_ATTR_FSUUID=y -CONFIG_EVM_LOAD_X509=y +# CONFIG_EVM_LOAD_X509 is not set CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" @@ -2079,7 +2080,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set -CONFIG_IMA_LOAD_X509=y +# CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 # CONFIG_IMA_NG_TEMPLATE is not set @@ -2088,7 +2089,6 @@ CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y # CONFIG_IMA_WRITE_POLICY is not set -CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der" CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set @@ -2124,7 +2124,7 @@ CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y # CONFIG_INFINIBAND_IPOIB is not set -# CONFIG_INFINIBAND_IRDMA is not set +CONFIG_INFINIBAND_IRDMA=m # CONFIG_INFINIBAND_ISER is not set # CONFIG_INFINIBAND_ISERT is not set CONFIG_INFINIBAND=m @@ -6354,6 +6354,7 @@ CONFIG_WAN=y # CONFIG_WARN_DYNAMIC_STACK is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 2d5c92392..db1b8c004 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -426,6 +426,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m @@ -2128,6 +2129,7 @@ CONFIG_HW_RANDOM_TPM=y CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set # CONFIG_HYPERV_TESTING is not set @@ -7051,6 +7053,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_DYNAMIC_STACK is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 38f2c5e25..7150dbde9 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -319,6 +319,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set @@ -1438,7 +1439,7 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_EVENT_TRACING=y # CONFIG_EVM_ADD_XATTRS is not set CONFIG_EVM_ATTR_FSUUID=y -CONFIG_EVM_LOAD_X509=y +# CONFIG_EVM_LOAD_X509 is not set CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" @@ -2063,7 +2064,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set -CONFIG_IMA_LOAD_X509=y +# CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 # CONFIG_IMA_NG_TEMPLATE is not set @@ -2072,7 +2073,6 @@ CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y # CONFIG_IMA_WRITE_POLICY is not set -CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der" CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set @@ -2108,7 +2108,7 @@ CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y # CONFIG_INFINIBAND_IPOIB is not set -# CONFIG_INFINIBAND_IRDMA is not set +CONFIG_INFINIBAND_IRDMA=m # CONFIG_INFINIBAND_ISER is not set # CONFIG_INFINIBAND_ISERT is not set CONFIG_INFINIBAND=m @@ -6335,6 +6335,7 @@ CONFIG_WAN=y # CONFIG_WARN_DYNAMIC_STACK is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 149a70a31..0307e418b 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -323,6 +323,7 @@ CONFIG_BASE_SMALL=0 # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set @@ -1448,7 +1449,7 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_EVENT_TRACING=y # CONFIG_EVM_ADD_XATTRS is not set CONFIG_EVM_ATTR_FSUUID=y -CONFIG_EVM_LOAD_X509=y +# CONFIG_EVM_LOAD_X509 is not set CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" @@ -2077,7 +2078,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set -CONFIG_IMA_LOAD_X509=y +# CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 # CONFIG_IMA_NG_TEMPLATE is not set @@ -2086,7 +2087,6 @@ CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y # CONFIG_IMA_WRITE_POLICY is not set -CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der" CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set @@ -2122,7 +2122,7 @@ CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y # CONFIG_INFINIBAND_IPOIB is not set -# CONFIG_INFINIBAND_IRDMA is not set +CONFIG_INFINIBAND_IRDMA=m # CONFIG_INFINIBAND_ISER is not set # CONFIG_INFINIBAND_ISERT is not set CONFIG_INFINIBAND=m @@ -6370,6 +6370,7 @@ CONFIG_WAN=y # CONFIG_WARN_DYNAMIC_STACK is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index f075e81a7..016b41599 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -471,6 +471,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17040 is not set CONFIG_BATTERY_MAX17042=m # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m @@ -2347,6 +2348,7 @@ CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set CONFIG_HYPERV_BALLOON=m @@ -7592,6 +7594,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 2f47f41e2..2dafd6da9 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -347,6 +347,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set @@ -1555,7 +1556,7 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_EVENT_TRACING=y # CONFIG_EVM_ADD_XATTRS is not set CONFIG_EVM_ATTR_FSUUID=y -CONFIG_EVM_LOAD_X509=y +# CONFIG_EVM_LOAD_X509 is not set CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" @@ -2239,7 +2240,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set -CONFIG_IMA_LOAD_X509=y +# CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 # CONFIG_IMA_NG_TEMPLATE is not set @@ -2249,7 +2250,6 @@ CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y # CONFIG_IMA_WRITE_POLICY is not set -CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der" CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set @@ -2286,7 +2286,7 @@ CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IRDMA is not set +CONFIG_INFINIBAND_IRDMA=m CONFIG_INFINIBAND_ISER=m CONFIG_INFINIBAND_ISERT=m CONFIG_INFINIBAND=m @@ -6644,6 +6644,7 @@ CONFIG_WAN=y # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 737272547..5198c216a 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -470,6 +470,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17040 is not set CONFIG_BATTERY_MAX17042=m # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m @@ -2330,6 +2331,7 @@ CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y +# CONFIG_HWSPINLOCK_SUN6I is not set CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set CONFIG_HYPERV_BALLOON=m @@ -7568,6 +7570,7 @@ CONFIG_W83977F_WDT=m # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index ece9ec454..7648e5adf 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -347,6 +347,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set @@ -1547,7 +1548,7 @@ CONFIG_ETHTOOL_NETLINK=y CONFIG_EVENT_TRACING=y # CONFIG_EVM_ADD_XATTRS is not set CONFIG_EVM_ATTR_FSUUID=y -CONFIG_EVM_LOAD_X509=y +# CONFIG_EVM_LOAD_X509 is not set CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" @@ -2223,7 +2224,7 @@ CONFIG_IMA_DEFAULT_HASH_SHA256=y # CONFIG_IMA_DISABLE_HTABLE is not set CONFIG_IMA_KEXEC=y # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set -CONFIG_IMA_LOAD_X509=y +# CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 # CONFIG_IMA_NG_TEMPLATE is not set @@ -2233,7 +2234,6 @@ CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y # CONFIG_IMA_WRITE_POLICY is not set -CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der" CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set @@ -2270,7 +2270,7 @@ CONFIG_INFINIBAND_IPOIB_CM=y # CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set CONFIG_INFINIBAND_IPOIB_DEBUG=y CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IRDMA is not set +CONFIG_INFINIBAND_IRDMA=m CONFIG_INFINIBAND_ISER=m CONFIG_INFINIBAND_ISERT=m CONFIG_INFINIBAND=m @@ -6622,6 +6622,7 @@ CONFIG_WAN=y # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set # CONFIG_WATCHDOG_NOWAYOUT is not set CONFIG_WATCHDOG_OPEN_TIMEOUT=0 # CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set diff --git a/kernel.spec b/kernel.spec index df6f2852f..9af934308 100755 --- a/kernel.spec +++ b/kernel.spec @@ -73,7 +73,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc0.20210707git77d34a4683b0.12 +%global distro_build 0.rc0.20210708gite9f1cbc0c411.13 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -117,13 +117,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 0.rc0.20210707git77d34a4683b0.12 +%define pkgrelease 0.rc0.20210708gite9f1cbc0c411.13 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20210707git77d34a4683b0.12%{?buildid}%{?dist} +%define specrelease 0.rc0.20210708gite9f1cbc0c411.13%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -156,8 +156,8 @@ Summary: The Linux kernel %define with_bpftool %{?_without_bpftool: 0} %{?!_without_bpftool: 1} # kernel-debuginfo %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1} -# kernel-abi-whitelists -%define with_kernel_abi_whitelists %{?_without_kernel_abi_whitelists: 0} %{?!_without_kernel_abi_whitelists: 1} +# kernel-abi-stablelists +%define with_kernel_abi_stablelists %{?_without_kernel_abi_stablelists: 0} %{?!_without_kernel_abi_stablelists: 1} # internal samples and selftests %define with_selftests %{?_without_selftests: 0} %{?!_without_selftests: 1} # @@ -217,8 +217,8 @@ Summary: The Linux kernel %define with_cross_headers 0 # no ipa_clone for now %define with_ipaclones 0 -# no whitelist -%define with_kernel_abi_whitelists 0 +# no stablelist +%define with_kernel_abi_stablelists 0 # Fedora builds these separately %define with_perf 0 %define with_tools 0 @@ -246,7 +246,7 @@ Summary: The Linux kernel %define with_kabidupchk 0 %define with_kabidwchk 0 %define with_kabidw_base 0 -%define with_kernel_abi_whitelists 0 +%define with_kernel_abi_stablelists 0 %endif # turn off kABI DWARF-based check if we're generating the base dataset @@ -305,7 +305,7 @@ Summary: The Linux kernel %define with_perf 0 %define with_tools 0 %define with_bpftool 0 -%define with_kernel_abi_whitelists 0 +%define with_kernel_abi_stablelists 0 %define with_selftests 0 %define with_cross 0 %define with_cross_headers 0 @@ -325,7 +325,7 @@ Summary: The Linux kernel %define with_perf 0 %define with_tools 0 %define with_bpftool 0 -%define with_kernel_abi_whitelists 0 +%define with_kernel_abi_stablelists 0 %define with_selftests 0 %define with_cross 0 %define with_cross_headers 0 @@ -348,7 +348,7 @@ Summary: The Linux kernel %endif %ifnarch noarch -%define with_kernel_abi_whitelists 0 +%define with_kernel_abi_stablelists 0 %endif # Overrides for generic default options @@ -556,7 +556,7 @@ BuildRequires: net-tools, hostname, bc, elfutils-devel BuildRequires: dwarves BuildRequires: python3-devel BuildRequires: gcc-plugin-devel -%ifnarch %{nobuildarches} +%ifnarch %{nobuildarches} noarch BuildRequires: bpftool %endif %if %{with_headers} @@ -655,7 +655,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13-11855-g77d34a4683b0.tar.xz +Source0: linux-5.13-12185-ge9f1cbc0c411.tar.xz Source1: Makefile.rhelver @@ -788,7 +788,7 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-whitelists-%{rpmversion}-%{distro_build}.tar.bz2 +Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2 Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2 # Sources for kernel-tools @@ -1034,10 +1034,10 @@ Summary: gcov graph and source files for coverage data collection. kernel-gcov includes the gcov graph and source files for gcov coverage collection. %endif -%package -n kernel-abi-whitelists -Summary: The Red Hat Enterprise Linux kernel ABI symbol whitelists +%package -n kernel-abi-stablelists +Summary: The Red Hat Enterprise Linux kernel ABI symbol stablelists AutoReqProv: no -%description -n kernel-abi-whitelists +%description -n kernel-abi-stablelists The kABI package contains information pertaining to the Red Hat Enterprise Linux kernel ABI, including lists of kernel symbols that are needed by external Linux kernel modules, and a yum plugin to aid enforcement. @@ -1340,8 +1340,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13-11855-g77d34a4683b0 -c -mv linux-5.13-11855-g77d34a4683b0 linux-%{KVERREL} +%setup -q -n kernel-5.13-12185-ge9f1cbc0c411 -c +mv linux-5.13-12185-ge9f1cbc0c411 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1734,13 +1734,13 @@ BuildKernel() { mkdir -p $RPM_BUILD_ROOT/kabi-dwarf tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf - mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/whitelists - tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/whitelists + mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists + tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists echo "**** GENERATING DWARF-based kABI baseline dataset ****" chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh generate \ - "$RPM_BUILD_ROOT/kabi-dwarf/whitelists/kabi-current/kabi_whitelist_%{_target_cpu}" \ + "$RPM_BUILD_ROOT/kabi-dwarf/stablelists/kabi-current/kabi_stablelist_%{_target_cpu}" \ "$(pwd)" \ "$RPM_BUILD_ROOT/kabidw-base/%{_target_cpu}${Variant:+.${Variant}}" || : @@ -1753,13 +1753,13 @@ BuildKernel() { mkdir -p $RPM_BUILD_ROOT/kabi-dwarf tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf if [ -d "$RPM_BUILD_ROOT/kabi-dwarf/base/%{_target_cpu}${Variant:+.${Variant}}" ]; then - mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/whitelists - tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/whitelists + mkdir -p $RPM_BUILD_ROOT/kabi-dwarf/stablelists + tar xjvf %{SOURCE300} -C $RPM_BUILD_ROOT/kabi-dwarf/stablelists echo "**** GENERATING DWARF-based kABI dataset ****" chmod 0755 $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh $RPM_BUILD_ROOT/kabi-dwarf/run_kabi-dw.sh generate \ - "$RPM_BUILD_ROOT/kabi-dwarf/whitelists/kabi-current/kabi_whitelist_%{_target_cpu}" \ + "$RPM_BUILD_ROOT/kabi-dwarf/stablelists/kabi-current/kabi_stablelist_%{_target_cpu}" \ "$(pwd)" \ "$RPM_BUILD_ROOT/kabi-dwarf/base/%{_target_cpu}${Variant:+.${Variant}}.tmp" || : @@ -2370,14 +2370,14 @@ done rm -rf $RPM_BUILD_ROOT/usr/tmp-headers %endif -%if %{with_kernel_abi_whitelists} +%if %{with_kernel_abi_stablelists} # kabi directory INSTALL_KABI_PATH=$RPM_BUILD_ROOT/lib/modules/ mkdir -p $INSTALL_KABI_PATH # install kabi releases directories tar xjvf %{SOURCE300} -C $INSTALL_KABI_PATH -# with_kernel_abi_whitelists +# with_kernel_abi_stablelists %endif %if %{with_perf} @@ -2689,8 +2689,8 @@ fi /usr/*-linux-gnu/include/* %endif -%if %{with_kernel_abi_whitelists} -%files -n kernel-abi-whitelists +%if %{with_kernel_abi_stablelists} +%files -n kernel-abi-stablelists /lib/modules/kabi-* %endif @@ -2922,10 +2922,14 @@ fi # # %changelog -* Wed Jul 07 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc0.20210707git77d34a4683b0.12] +* Thu Jul 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc0.20210708gite9f1cbc0c411.13] - Fix the perf trace link location (Justin M. Forbes) - drm/amdgpu/dc: Really fix DCN3.1 Makefile for PPC64 (Michal Suchanek) +* Thu Jul 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc0.20210708gite9f1cbc0c411.12] +- rpmspec: do not BuildRequires bpftool on noarch (Herton R. Krzesinski) +- redhat/configs: disable {IMA,EVM}_LOAD_X509 (Bruno Meneguele) [1977529] + * Wed Jul 07 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc0.20210707git77d34a4683b0.11] - redhat: add secureboot CA certificate to trusted kernel keyring (Bruno Meneguele) - redhat/configs: enable IMA_ARCH_POLICY for aarch64 and s390x (Bruno Meneguele) diff --git a/patch-5.14.0-redhat.patch b/patch-5.14.0-redhat.patch index ee008a1dd..b82876483 100644 --- a/patch-5.14.0-redhat.patch +++ b/patch-5.14.0-redhat.patch @@ -293,10 +293,10 @@ index b58ee83f30e3..66e08b5d86d3 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index a99d00393206..2ca44d88e832 100644 +index 64b805bd6a54..e6702f1e1beb 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c -@@ -1308,6 +1308,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) +@@ -1304,6 +1304,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) cpu_detect(c); get_cpu_vendor(c); get_cpu_cap(c); @@ -2487,7 +2487,7 @@ index e343f158e556..840c5ecd4fc6 100644 if (err) return err; diff --git a/kernel/module.c b/kernel/module.c -index 927d46cb8eb9..387e08c31633 100644 +index 64bd61b2d3ad..c1a2a8a29248 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -742,6 +742,7 @@ static struct module_attribute modinfo_##field = { \ @@ -2498,7 +2498,7 @@ index 927d46cb8eb9..387e08c31633 100644 static char last_unloaded_module[MODULE_NAME_LEN+1]; -@@ -1206,6 +1207,7 @@ static struct module_attribute *modinfo_attrs[] = { +@@ -1205,6 +1206,7 @@ static struct module_attribute *modinfo_attrs[] = { &module_uevent, &modinfo_version, &modinfo_srcversion, @@ -1,3 +1,4 @@ -SHA512 (linux-5.13-11855-g77d34a4683b0.tar.xz) = 0971ff74b54e91e727adcb2fb40715aff925deca5c8574c61ff658b29ca508f61b71776134f22939f905c34fc1eb69ab3f4bbaed5cef12cf06e8950d867309f0 SHA512 (kernel-abi-whitelists-5.14.0-0.rc0.20210707git77d34a4683b0.12.tar.bz2) = 411f2a75d47633c61eb416d270a293d6965cf69b05fdada93480765da88185cea0378820f53b66fd405549374a5094868530f2451d1d2e6eda970afdc2d4bbb8 -SHA512 (kernel-kabi-dw-5.14.0-0.rc0.20210707git77d34a4683b0.12.tar.bz2) = ef817adfa46a2e6587ef07e207aceb8026d2fc442916e5c2ddb8b3b56acdb35c693e3cfe95f88c5d78ae234d3ad9c702c6f2775c2658f59840832f21018e4dd8 +SHA512 (linux-5.13-12185-ge9f1cbc0c411.tar.xz) = baef008a3705ca8ea3dc94a3e003167f4556c948c4a6042ce034f26432ab5fe7a64b0dd8269ed514cc615ad4d07fd47aa4bd98c3f00c18816f59de1afd7eff82 +SHA512 (kernel-abi-stablelists-5.14.0-0.rc0.20210708gite9f1cbc0c411.13.tar.bz2) = 01ce46a50420619e13e5dc973e4720e9ee56d73c9c1231099086b02d2d9fd649839d398c3a02a715c5a1aaaf1b276368ec84e768b7e97391d9317c11247bd0f0 +SHA512 (kernel-kabi-dw-5.14.0-0.rc0.20210708gite9f1cbc0c411.13.tar.bz2) = aa8f8739b61d4a3550d0d96eab11baea8ac9f93ab8b4fd00e37e9201932d8f5174c0e952fea04072addae1394ae44e1e678d097a9e034cc4ab9256ac37e1eafa |