diff --git a/Makefile.rhelver b/Makefile.rhelver index 5bb0e7a..f4c7c43 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.1 +RTBUILD:=.2 diff --git a/kernel-rt-x86_64-debug-rhel.config b/kernel-rt-x86_64-debug-rhel.config index 522492a..956a63a 100644 --- a/kernel-rt-x86_64-debug-rhel.config +++ b/kernel-rt-x86_64-debug-rhel.config @@ -2772,12 +2772,12 @@ CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_BASE_RELATIVE=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_MODULE_TEST is not set # CONFIG_KASAN_OUTLINE is not set -CONFIG_KASAN_VMALLOC=y -CONFIG_KASAN=y +# CONFIG_KASAN_VMALLOC is not set # CONFIG_KCOV is not set # CONFIG_KCSAN is not set CONFIG_KDB_CONTINUE_CATASTROPHIC=0 diff --git a/kernel.spec b/kernel.spec index 062c201..43d566d 100755 --- a/kernel.spec +++ b/kernel.spec @@ -117,13 +117,13 @@ Summary: The Linux kernel %define kversion 5.13 %define rpmversion 5.13.0 -%define pkgrelease 1.rt3.1 +%define pkgrelease 1.rt3.2 # This is needed to do merge window version magic %define patchlevel 13 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1.rt3.1%{?buildid}%{?dist} +%define specrelease 1.rt3.2%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -670,7 +670,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13.0-1.rt3.1.tar.xz +Source0: linux-5.13.0-1.rt3.2.tar.xz Source1: Makefile.rhelver @@ -1384,8 +1384,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13.0-1.rt3.1 -c -mv linux-5.13.0-1.rt3.1 linux-%{KVERREL} +%setup -q -n kernel-5.13.0-1.rt3.2 -c +mv linux-5.13.0-1.rt3.2 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3013,8 +3013,9 @@ fi # # %changelog -* Thu Jul 08 2021 Juri Lelli [5.13.0-1.rt3.1] +* Tue Jul 13 2021 Andrew Halaney [5.13.0-1.rt3.2] - b5dcc29e819c rebase +- config: disable KASAN for kernel-rt-debug kernels (Luis Claudio R. Goncalves) [1977862] - Revert "eventfd: track eventfd_signal() recursion depth" (Juri Lelli) - Revert "aio: prevent potential eventfd recursion on poll" (Juri Lelli) - redhat: Add realtime-setup dependecy for kernel-rt metapackage (Juri Lelli) [1937013] diff --git a/sources b/sources index 3c1be12..b0f767f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.13.0-1.rt3.1.tar.xz) = c4bec769a3d8464b14d5b870ce73267cf42aa8a7db94e3ffea6ba1f6aff4dc34be74d60414a657850646f039860b77c976b0a15cab74e835bf950b8c35964dd4 -SHA512 (kernel-abi-whitelists-5.13.0-1.tar.bz2) = e9655d6a817d28cfaca6a60db5616570a49740b4771dc54a264513afb55ef8cf3141277eae8ab2c01841d32f7329445b970089925ef4007db6785e20c08140b9 -SHA512 (kernel-kabi-dw-5.13.0-1.tar.bz2) = f84faa0530dafbbb41d61aca1fee3798aa17b653fa32bfe416ca1eebfd1db80d83d4c7a14ad3dd216016fc3b965461aead97bf6e613c7c7d2276fddfcb2a1178 +SHA512 (linux-5.13.0-1.rt3.2.tar.xz) = e72edf40806928c44721c768bcc7ac2b45f0e5045771209ddfd00893f8f29ce57b1870dcf17085bc6bb2d836be8ada9f599b8aeaa73ecc1c64b7a57f8dea62d8 +SHA512 (kernel-abi-whitelists-5.13.0-1.tar.bz2) = ceba454e1f590c1e4ef4115a75463ae3ac2c2aa7ec85fa14a2669d666c421483a38225ee19d7d72b4ac7032375741408b23543e43588538c80161ec0cf57051c +SHA512 (kernel-kabi-dw-5.13.0-1.tar.bz2) = 884da395db74aea496a24099338703335c4914c91cee2e6861216ce9d9a2e2a4456a3ec8a20d7595e20ea11c7ba8a279768b36b7e942636b38b50554a7826515