From 88165ca308f8e954efc21fbe9295a3ae26c327d8 Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Fri, 5 Feb 2021 07:51:04 -0500 Subject: [PATCH] kernel-5.11.0-0.rc6.145.el9 * Fri Feb 05 2021 Herton R. Krzesinski [5.11.0-0.rc6.145] - v5.11-rc6-139-gdd86e7fa07a3 rebase - Turn off additional KASAN options for Fedora (Justin M. Forbes) Signed-off-by: Herton R. Krzesinski --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel-aarch64-debug-fedora.config | 4 ++-- kernel-armv7hl-debug-fedora.config | 2 ++ kernel-armv7hl-lpae-debug-fedora.config | 2 ++ kernel-i686-debug-fedora.config | 2 ++ kernel-ppc64le-debug-fedora.config | 2 ++ kernel-s390x-debug-fedora.config | 2 ++ kernel-x86_64-debug-fedora.config | 4 ++-- kernel.spec | 23 +++++++++++++---------- sources | 6 +++--- 11 files changed, 33 insertions(+), 20 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index c9accf1..2c25a62 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 = 144 +RHEL_RELEASE = 145 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 0e930e0..5b70eac 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/2eeb557d7ea6e3a1802dca85e12e6a2ad83fdce0 - 2eeb557d7ea6e3a1802dca85e12e6a2ad83fdce0 Bluetooth: L2CAP: Try harder to accept device not knowing options +https://gitlab.com/cki-project/kernel-ark/-/commit/2f3a17ce5c1db554bdd90d0ca12f5db06ce28d45 + 2f3a17ce5c1db554bdd90d0ca12f5db06ce28d45 Bluetooth: L2CAP: Try harder to accept device not knowing options https://gitlab.com/cki-project/kernel-ark/-/commit/035ea4b6c436e53b4c9e388bc65c965f310e216c 035ea4b6c436e53b4c9e388bc65c965f310e216c redhat: remove remaining references of CONFIG_RH_DISABLE_DEPRECATED diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index a3b1595..84543a0 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3263,9 +3263,9 @@ CONFIG_K3_DMA=m CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y CONFIG_KARMA_PARTITION=y -CONFIG_KASAN_GENERIC=y +# CONFIG_KASAN_GENERIC is not set # CONFIG_KASAN_HW_TAGS is not set -CONFIG_KASAN_INLINE=y +# CONFIG_KASAN_INLINE is not set # CONFIG_KASAN is not set # CONFIG_KASAN_OUTLINE is not set # CONFIG_KASAN_SW_TAGS is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 4dbcda0..6b2ab10 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -3307,7 +3307,9 @@ CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y CONFIG_KARMA_PARTITION=y +# CONFIG_KASAN_GENERIC is not set # CONFIG_KASAN_HW_TAGS is not set +# CONFIG_KASAN_INLINE is not set # CONFIG_KASAN is not set # CONFIG_KASAN_OUTLINE is not set # CONFIG_KASAN_VMALLOC is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index ad91b2d..0a2eb6b 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -3239,7 +3239,9 @@ CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y CONFIG_KARMA_PARTITION=y +# CONFIG_KASAN_GENERIC is not set # CONFIG_KASAN_HW_TAGS is not set +# CONFIG_KASAN_INLINE is not set # CONFIG_KASAN is not set # CONFIG_KASAN_OUTLINE is not set # CONFIG_KASAN_VMALLOC is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 8a50ac5..6f00cbd 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -2948,6 +2948,8 @@ CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y CONFIG_KARMA_PARTITION=y +# CONFIG_KASAN_GENERIC is not set +# CONFIG_KASAN_INLINE is not set # CONFIG_KASAN is not set # CONFIG_KASAN_OUTLINE is not set # CONFIG_KASAN_VMALLOC is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index cd98019..89c8ef3 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2709,6 +2709,8 @@ CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y CONFIG_KARMA_PARTITION=y +# CONFIG_KASAN_GENERIC is not set +# CONFIG_KASAN_INLINE is not set # CONFIG_KASAN is not set # CONFIG_KASAN_OUTLINE is not set # CONFIG_KASAN_VMALLOC is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 9680d7b..2cd1691 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2686,6 +2686,8 @@ CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y CONFIG_KARMA_PARTITION=y +# CONFIG_KASAN_GENERIC is not set +# CONFIG_KASAN_INLINE is not set # CONFIG_KASAN is not set # CONFIG_KASAN_OUTLINE is not set # CONFIG_KASAN_VMALLOC is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index d0a6cc9..7b1660c 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2995,8 +2995,8 @@ CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y CONFIG_KARMA_PARTITION=y -CONFIG_KASAN_GENERIC=y -CONFIG_KASAN_INLINE=y +# CONFIG_KASAN_GENERIC is not set +# CONFIG_KASAN_INLINE is not set # CONFIG_KASAN is not set # CONFIG_KASAN_OUTLINE is not set # CONFIG_KASAN_VMALLOC is not set diff --git a/kernel.spec b/kernel.spec index 895d1a4..6217628 100755 --- a/kernel.spec +++ b/kernel.spec @@ -64,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc6.144 +%global distro_build 0.rc6.145 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -105,13 +105,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc6.144 +%define pkgrelease 0.rc6.145 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.144%{?buildid}%{?dist} +%define specrelease 0.rc6.145%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -601,7 +601,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.11.0-0.rc6.144.tar.xz +Source0: linux-5.11.0-0.rc6.145.tar.xz Source1: Makefile.rhelver @@ -1246,8 +1246,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11.0-0.rc6.144 -c -mv linux-5.11.0-0.rc6.144 linux-%{KVERREL} +%setup -q -n kernel-5.11.0-0.rc6.145 -c +mv linux-5.11.0-0.rc6.145 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2736,13 +2736,16 @@ fi # # %changelog -* Thu Feb 04 2021 Herton R. Krzesinski [5.11.0-0.rc6.144] -- v5.11-rc6-126-g61556703b610 rebase +* Fri Feb 05 2021 Herton R. Krzesinski [5.11.0-0.rc6.145] +- v5.11-rc6-139-gdd86e7fa07a3 rebase -* Thu Feb 04 2021 Fedora Kernel Team [5.11.0-0.rc6.20210204git61556703b610.144] -- Rename the master branch to rawhide for Fedora (Justin M. Forbes) +* Fri Feb 05 2021 Fedora Kernel Team [5.11.0-0.rc6.20210205gitdd86e7fa07a3.145] - Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera) +* Fri Feb 05 2021 Fedora Kernel Team [5.11.0-0.rc6.20210205gitdd86e7fa07a3.144] +- Turn off additional KASAN options for Fedora (Justin M. Forbes) +- Rename the master branch to rawhide for Fedora (Justin M. Forbes) + * Thu Feb 04 2021 Fedora Kernel Team [5.11.0-0.rc6.20210204git61556703b610.143] - Makefile targets for packit integration (Ben Crocker) - Turn off KASAN for rawhide debug builds (Justin M. Forbes) diff --git a/sources b/sources index 4d8d3be..6819009 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.11.0-0.rc6.144.tar.xz) = 44d81d1c9511c61d1f9d145f8a3fdb1f9b59ccfe93811fa77b8db3c1a3822b6cd0aed50d9fcf04128bb67a6af6041168529f76c8247b3ca4d95e56448ac15c39 -SHA512 (kernel-abi-whitelists-5.11.0-0.rc6.144.tar.bz2) = d02deb068e202db81e3d0f375050f17d1994eb0a7ec51f42d44125cd217796bce1f099cecdba5f6a9dea2d341ea02135975830cb85629cdcc8c8175ade5be4ce -SHA512 (kernel-kabi-dw-5.11.0-0.rc6.144.tar.bz2) = e5db30fd6dcf527b49ef3d6588e88721111656b9cfc99d74c5f710cedebb8caec1cf206692ab442092a7ca046b428bf37123781777bcc80c03e15b8d19f505f1 +SHA512 (linux-5.11.0-0.rc6.145.tar.xz) = 37de0b214838241a33855b2aac43787ad18b0201953d3d130b06ab96c940d4755e96bbdb848f1d3bc1f4748584faa53c6c29ffa7649d67cc98c1516f4b4d60bb +SHA512 (kernel-abi-whitelists-5.11.0-0.rc6.145.tar.bz2) = c50b82aabad4f2e49b4f998a5dc76564af4a489982f8e7e4e4a88525269cc24abb3dde568ade93176128376877b5f9daf897dc78e896cb5c7eb5b1faa30e2b2d +SHA512 (kernel-kabi-dw-5.11.0-0.rc6.145.tar.bz2) = 1c6cd6285b506d7379f67bb4140f0589bdef5c4431c7946aade272b30c15bddd19f58dc096e8bfcb1dc20c154e78f964289f92db8b2ecbad2d3f75ab16120451