diff options
30 files changed, 57 insertions, 143 deletions
diff --git a/0001-Fix-up-a-merge-issue-with-rxe.c.patch b/0001-Fix-up-a-merge-issue-with-rxe.c.patch deleted file mode 100644 index 0d9cdd163..000000000 --- a/0001-Fix-up-a-merge-issue-with-rxe.c.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 364788093bdf437c33753d327136c363be8f756c Mon Sep 17 00:00:00 2001 -From: "Justin M. Forbes" <jforbes@fedoraproject.org> -Date: Mon, 26 Oct 2020 10:18:33 -0500 -Subject: [PATCH] Fix up a merge issue with rxe.c - -Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org> ---- - drivers/infiniband/sw/rxe/rxe.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c -index 61725443c33b..faa8a6cadef1 100644 ---- a/drivers/infiniband/sw/rxe/rxe.c -+++ b/drivers/infiniband/sw/rxe/rxe.c -@@ -286,13 +286,6 @@ static int __init rxe_module_init(void) - - mark_tech_preview("Soft-RoCE Transport Driver", THIS_MODULE); - -- /* initialize slab caches for managed objects */ -- err = rxe_cache_init(); -- if (err) { -- pr_err("unable to init object pools\n"); -- return err; -- } -- - err = rxe_net_init(); - if (err) - return err; --- -2.28.0 - diff --git a/Makefile.rhelver b/Makefile.rhelver index 104463fa3..f2cf71d95 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 = 56 +RHEL_RELEASE = 57 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 9cce23086..08f487a65 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,11 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/67aa1b57cf2c9b9c6fdfb51896995dac508906d3 - 67aa1b57cf2c9b9c6fdfb51896995dac508906d3 Filter out LTO build options from the perl ccopts +https://gitlab.com/cki-project/kernel-ark/-/commit/9aa1ec5b52ec51e001bf9cc8bcb03a3b11169a05 + 9aa1ec5b52ec51e001bf9cc8bcb03a3b11169a05 Filter out LTO build options from the perl ccopts -https://gitlab.com/cki-project/kernel-ark/-/commit/30e946a449e41c42d277880d2a1b217fa67c929b - 30e946a449e41c42d277880d2a1b217fa67c929b Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 +https://gitlab.com/cki-project/kernel-ark/-/commit/c2dfd820ea052ab38b8b58a0f4a2ea72b6b6e763 + c2dfd820ea052ab38b8b58a0f4a2ea72b6b6e763 Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 + +https://gitlab.com/cki-project/kernel-ark/-/commit/364788093bdf437c33753d327136c363be8f756c + 364788093bdf437c33753d327136c363be8f756c Fix up a merge issue with rxe.c https://gitlab.com/cki-project/kernel-ark/-/commit/17b0f7f1d49df30661b517d668715ff5ee1bab09 17b0f7f1d49df30661b517d668715ff5ee1bab09 Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL only diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 82c49ef2d..28eb70eef 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5883,7 +5883,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 69887e741..b4e37f437 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4668,7 +4668,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index d932fe3de..d343214ef 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5864,7 +5864,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index efae16bfd..09af0e451 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4650,7 +4650,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 103c67963..df500710f 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -6018,7 +6018,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 7e6369e4c..7ee2ac9a7 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6000,7 +6000,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 5b2a9ee1e..d27f5094f 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -5835,7 +5835,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index d4581ce31..7bb8b90f0 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -5817,7 +5817,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index f726ade4e..633e7fdf0 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -5310,7 +5310,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 14655d8ef..ca0e46de4 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -5291,7 +5291,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 384f15246..a1df56f1e 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4983,7 +4983,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index b910091d7..72946e298 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4517,7 +4517,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 3d98f4089..60bd22309 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4963,7 +4963,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 6ba5ae3c5..9149a0d79 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4501,7 +4501,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 1e92598a5..8348e8222 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4931,7 +4931,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index c24ce3304..7cf76e984 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4463,7 +4463,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 94ab0f327..c440c761c 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4911,7 +4911,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 5f0c2d2db..d8bca96d2 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4447,7 +4447,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 93be020ad..f216120a8 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -4476,7 +4476,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index b197b7307..1efbaa507 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5353,7 +5353,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 12efcc3e0..5a5bed958 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4671,7 +4671,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 59e91bb73..bd1a1b674 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5334,7 +5334,7 @@ CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 6fd6cd6b9..d69a75c41 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4653,7 +4653,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_DISABLE=y +# CONFIG_SECURITY_SELINUX_DISABLE is not set CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX=y diff --git a/kernel.spec b/kernel.spec index 88e529951..21485d7e5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,3 +1,5 @@ +%global _lto_cflags %{nil} + # We have to override the new %%install behavior because, well... the kernel is special. %global __spec_install_pre %{___build_pre} @@ -30,7 +32,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc1.56 +%global distro_build 0.rc1.20201028gited8780e3f2ec.57 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -69,13 +71,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.10.0 -%define pkgrelease 0.rc1.56 +%define pkgrelease 0.rc1.20201028gited8780e3f2ec.57 # This is needed to do merge window version magic %define patchlevel 10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.56%{?buildid}%{?dist} +%define specrelease 0.rc1.20201028gited8780e3f2ec.57%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -166,7 +168,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # The kernel tarball/base version %define kversion 5.10 @@ -182,10 +184,10 @@ Summary: The Linux kernel # no whitelist %define with_kernel_abi_whitelists 0 # Fedora builds these separately -%endif %define with_perf 0 %define with_tools 0 %define with_bpftool 0 +%endif %if %{with_verbose} %define make_opts V=1 @@ -508,7 +510,7 @@ BuildRequires: python3-docutils BuildRequires: zlib-devel binutils-devel %endif %if %{with_selftests} -BuildRequires: clang llvm +BuildRequires: llvm %ifnarch %{arm} BuildRequires: numactl-devel %endif @@ -566,7 +568,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.10-rc1.tar.xz +Source0: linux-20201028gited8780e3f2ec.tar.xz Source1: Makefile.rhelver @@ -716,8 +718,6 @@ Source4000: README.rst %if !%{nopatches} Patch1: patch-%{rpmversion}-redhat.patch -Patch2: 0001-Fix-up-a-merge-issue-with-rxe.c.patch -Patch3: s390_build_fix.patch %endif # empty final patch to facilitate testing of kernel patches @@ -1212,8 +1212,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.10-rc1 -c -mv linux-5.10-rc1 linux-%{KVERREL} +%setup -q -n kernel-20201028gited8780e3f2ec -c +mv linux-20201028gited8780e3f2ec linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1221,8 +1221,6 @@ cp -a %{SOURCE1} . %if !%{nopatches} ApplyOptionalPatch patch-%{rpmversion}-redhat.patch -ApplyOptionalPatch 0001-Fix-up-a-merge-issue-with-rxe.c.patch -ApplyOptionalPatch s390_build_fix.patch %endif ApplyOptionalPatch linux-kernel-test.patch @@ -2650,10 +2648,17 @@ fi # # %changelog -* Mon Oct 26 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc1.55] +* Wed Oct 28 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc1.20201028gited8780e3f2ec.56] +- Fix LTO issues with kernel-tools (Don Zickus) +- Point pathfix to the new location for gen_compile_commands.py ("Justin M. Forbes") - Filter out LTO build options from the perl ccopts ("Justin M. Forbes") - Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 ("Justin M. Forbes") +* Wed Oct 28 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc1.20201028gited8780e3f2ec.55.test] +- ed8780e3f2ec rebase +- Fix up a merge issue with rxe.c ("Justin M. Forbes") +- configs: Disable CONFIG_SECURITY_SELINUX_DISABLE (Ondrej Mosnacek) + * Mon Oct 26 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc1.54.test] - v5.10-rc1 rebase diff --git a/patch-5.10.0-redhat.patch b/patch-5.10.0-redhat.patch index 4964e1905..ee09d51e2 100644 --- a/patch-5.10.0-redhat.patch +++ b/patch-5.10.0-redhat.patch @@ -28,7 +28,7 @@ drivers/gpu/drm/panel/panel-xingbangda-xbd599.c | 366 +++++++++++++++++++++ drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 10 +- drivers/hid/hid-rmi.c | 64 ---- - drivers/infiniband/sw/rxe/rxe.c | 9 + + drivers/infiniband/sw/rxe/rxe.c | 2 + drivers/input/rmi4/rmi_driver.c | 124 ++++--- drivers/iommu/iommu.c | 22 ++ drivers/message/fusion/mptsas.c | 10 + @@ -71,7 +71,7 @@ security/lockdown/lockdown.c | 1 + security/security.c | 6 + tools/perf/Makefile.config | 1 + - 73 files changed, 1592 insertions(+), 191 deletions(-) + 73 files changed, 1585 insertions(+), 191 deletions(-) diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst index 75a9dd98e76e..3ff3291551f9 100644 @@ -1434,22 +1434,15 @@ index 311eee599ce9..2460c6bd46f8 100644 data->xport.ops = &hid_rmi_ops; diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c -index 95f0de0c8b49..61725443c33b 100644 +index 95f0de0c8b49..faa8a6cadef1 100644 --- a/drivers/infiniband/sw/rxe/rxe.c +++ b/drivers/infiniband/sw/rxe/rxe.c -@@ -284,6 +284,15 @@ static int __init rxe_module_init(void) +@@ -284,6 +284,8 @@ static int __init rxe_module_init(void) { int err; + mark_tech_preview("Soft-RoCE Transport Driver", THIS_MODULE); + -+ /* initialize slab caches for managed objects */ -+ err = rxe_cache_init(); -+ if (err) { -+ pr_err("unable to init object pools\n"); -+ return err; -+ } -+ err = rxe_net_init(); if (err) return err; diff --git a/s390_build_fix.patch b/s390_build_fix.patch deleted file mode 100644 index 6a24b611e..000000000 --- a/s390_build_fix.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 8e90b4b1305a80b1d7712370a163eff269ac1ba2 Mon Sep 17 00:00:00 2001 -From: Vasily Gorbik <gor@linux.ibm.com> -Date: Mon, 26 Oct 2020 10:52:26 +0100 -Subject: s390: correct __bootdata / __bootdata_preserved macros - -Currently s390 build is broken. - - SECTCMP .boot.data -error: section .boot.data differs between vmlinux and arch/s390/boot/compressed/vmlinux -make[2]: *** [arch/s390/boot/section_cmp.boot.data] Error 1 - SECTCMP .boot.preserved.data -error: section .boot.preserved.data differs between vmlinux and arch/s390/boot/compressed/vmlinux -make[2]: *** [arch/s390/boot/section_cmp.boot.preserved.data] Error 1 -make[1]: *** [bzImage] Error 2 - -Commit 33def8498fdd ("treewide: Convert macro and uses of __section(foo) -to __section("foo")") converted all __section(foo) to __section("foo"). -This is wrong for __bootdata / __bootdata_preserved macros which want -variable names to be a part of intermediate section names .boot.data.<var -name> and .boot.preserved.data.<var name>. Those sections are later -sorted by alignment + name and merged together into final .boot.data -/ .boot.preserved.data sections. Those sections must be identical in -the decompressor and the decompressed kernel (that is checked during -the build). - -Fixes: 33def8498fdd ("treewide: Convert macro and uses of __section(foo) to __section("foo")") -Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> -Signed-off-by: Heiko Carstens <hca@linux.ibm.com> ---- - arch/s390/include/asm/sections.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/s390/include/asm/sections.h b/arch/s390/include/asm/sections.h -index a996d3990a02b..0c2151451ba59 100644 ---- a/arch/s390/include/asm/sections.h -+++ b/arch/s390/include/asm/sections.h -@@ -26,14 +26,14 @@ static inline int arch_is_kernel_initmem_freed(unsigned long addr) - * final .boot.data section, which should be identical in the decompressor and - * the decompressed kernel (that is checked during the build). - */ --#define __bootdata(var) __section(".boot.data.var") var -+#define __bootdata(var) __section(".boot.data." #var) var - - /* - * .boot.preserved.data is similar to .boot.data, but it is not part of the - * .init section and thus will be preserved for later use in the decompressed - * kernel. - */ --#define __bootdata_preserved(var) __section(".boot.preserved.data.var") var -+#define __bootdata_preserved(var) __section(".boot.preserved.data." #var) var - - extern unsigned long __sdma, __edma; - extern unsigned long __stext_dma, __etext_dma; --- -cgit 1.2.3-1.el7 - @@ -1,3 +1,3 @@ -SHA512 (linux-5.10-rc1.tar.xz) = b3a8a501f604b7c48594040c39e60106407779456dcce1b49d061d5a46adf4cc0501380059e3314a9d5acb8e256afbb3dd8f5e73381d53879d408de3e26b2d60 -SHA512 (kernel-abi-whitelists-5.10.0-0.rc1.56.tar.bz2) = e062901344a2307b97c2397fc46f90ec2e6ccd1904eaba3a71b2d20d17c946799b299f454500985af33d31a1483965d651763a4471e7f7c2340611e115f9de3a -SHA512 (kernel-kabi-dw-5.10.0-0.rc1.56.tar.bz2) = 923913ab385173979e473638fda5be2431bc8590222e7e4e18f2c9de56412a1745d196747b2b55cb3ea45aa8a2911e6d8fdfac236fb90b56023d2c3401193649 +SHA512 (linux-20201028gited8780e3f2ec.tar.xz) = 1381b4982281aac746f94fdeb701723de1accc08cced1860271530d51c0226b78121f4e8e1e254c4b29f75df923f0e67f3e1583031c330a6cbc355649073944a +SHA512 (kernel-abi-whitelists-5.10.0-0.rc1.20201028gited8780e3f2ec.57.tar.bz2) = 5ff7408e28b4683f26b496b4d228be44433b9c2a365e164d3112b7f78d20f8867aa4a21604b0552783b0ca357571d97c7a49e6e3b8f7fa6a9141bac50d75137a +SHA512 (kernel-kabi-dw-5.10.0-0.rc1.20201028gited8780e3f2ec.57.tar.bz2) = d584a9abc5d6ae0c8847613bc4e2c1692de93ddaab2cea16e50632246bb6bd3842446783e5b80e0af73859f2a370f3d067ee7658948063839385b1574f900a5e |