From 0f02eb5600e56532a2840f09f3ce4a371f8240fe Mon Sep 17 00:00:00 2001 From: rmartinc Date: Wed, 23 Apr 2025 17:41:00 +0200 Subject: [PATCH 1/2] Adapt fake_fips for kernel 6.11 Closes #39125 Signed-off-by: rmartinc --- .github/fake_fips/fake_fips.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/fake_fips/fake_fips.c b/.github/fake_fips/fake_fips.c index 5c0b38c39420..6ea9dda2a777 100644 --- a/.github/fake_fips/fake_fips.c +++ b/.github/fake_fips/fake_fips.c @@ -34,7 +34,9 @@ static struct ctl_table crypto_sysctl_table[] = { .mode = 0444, .proc_handler = proc_dointvec }, - {} +#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)) + {} +#endif }; static struct ctl_table crypto_dir_table[] = { { @@ -44,7 +46,9 @@ static struct ctl_table crypto_dir_table[] = { .child = crypto_sysctl_table #endif }, +#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)) {} +#endif }; static struct ctl_table_header *crypto_sysctls; From 6d6392fc101d096a59d5d2a476059f6ceb5139a5 Mon Sep 17 00:00:00 2001 From: Alexander Schwartz Date: Wed, 23 Apr 2025 19:40:43 +0200 Subject: [PATCH 2/2] Add ci to the fake_fips directory Signed-off-by: Alexander Schwartz --- .github/actions/conditional/conditions | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/conditional/conditions b/.github/actions/conditional/conditions index a233d809d456..22f5d2fd95e5 100644 --- a/.github/actions/conditional/conditions +++ b/.github/actions/conditional/conditions @@ -3,6 +3,7 @@ # To test a pattern run '.github/actions/conditional/conditional.sh ' .github/actions/ ci ci-quarkus ci-store ci-sssd operator js codeql-java codeql-javascript codeql-typescript guides documentation +.github/fake_fips/ ci .github/scripts/ ci ci-quarkus ci-sssd .github/scripts/ansible/ ci-store .github/scripts/aws/ ci-store