diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-19 21:14:03 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-19 21:14:03 +0200 |
| commit | ec4d166e3c82e11f05003fe10b21754be0ee9fcd (patch) | |
| tree | 350ae09d614a48e574dd96126b3d282e4325224e | |
| parent | 9b95018454e316c3b9063b1092bb91734cc7dae2 (diff) | |
| parent | 21a7c14e34a6bdcb8841f7f958b2d39626ab3ed8 (diff) | |
| download | kernel-ec4d166e3c82e11f05003fe10b21754be0ee9fcd.tar.gz kernel-ec4d166e3c82e11f05003fe10b21754be0ee9fcd.tar.xz kernel-ec4d166e3c82e11f05003fe10b21754be0ee9fcd.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc8.191.vanilla.1.fc35kernel-5.12.0-0.rc8.191.vanilla.1.fc34kernel-5.12.0-0.rc8.191.vanilla.1.fc33kernel-5.12.0-0.rc8.191.vanilla.1.fc32
| -rwxr-xr-x | kernel.spec | 14 | ||||
| -rw-r--r-- | patch-5.12.0-redhat.patch | 6 | ||||
| -rw-r--r-- | sources | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/kernel.spec b/kernel.spec index dd9e92755..81de12769 100755 --- a/kernel.spec +++ b/kernel.spec @@ -66,7 +66,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc7.20210416git7e25f40eab52.191 +%global distro_build 0.rc8.191 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -109,13 +109,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.12.0 -%define pkgrelease 0.rc7.20210416git7e25f40eab52.191 +%define pkgrelease 0.rc8.191 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20210416git7e25f40eab52.191%{?buildid}%{?dist} +%define specrelease 0.rc8.191%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -624,7 +624,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210416git7e25f40eab52.tar.xz +Source0: linux-5.12-rc8.tar.xz Source1: Makefile.rhelver @@ -1279,8 +1279,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210416git7e25f40eab52 -c -mv linux-20210416git7e25f40eab52 linux-%{KVERREL} +%setup -q -n kernel-5.12-rc8 -c +mv linux-5.12-rc8 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2795,7 +2795,7 @@ fi # # %changelog -* Fri Apr 16 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc7.20210416git7e25f40eab52.191] +* Mon Apr 19 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc8.191] - filter-modules.sh.fedora: clean up "netprots" (Paul Bolle) - filter-modules.sh.fedora: clean up "scsidrvs" (Paul Bolle) - filter-*.sh.fedora: clean up "ethdrvs" (Paul Bolle) diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch index 3d58921e5..aff8c61da 100644 --- a/patch-5.12.0-redhat.patch +++ b/patch-5.12.0-redhat.patch @@ -140,7 +140,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 4730cf156f6b..190e162d82e9 100644 +index bc19584fee59..3251d831d4da 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -178,10 +178,10 @@ index 4730cf156f6b..190e162d82e9 100644 $(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 5da96f5df48f..a35494d5910d 100644 +index 2fae14857dcf..ce5c2eb4b5ff 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1475,9 +1475,9 @@ config HIGHMEM +@@ -1481,9 +1481,9 @@ config HIGHMEM If unsure, say n. config HIGHPTE @@ -1,3 +1,3 @@ -SHA512 (linux-20210416git7e25f40eab52.tar.xz) = 1c6f68b655690fcdba61c73e889f6614ae4353e04366ffac9bf8fadb12d111ecaf307b13e0e64a14f818b4a824398b295da03bf6e1ddf8bb08caa0ecb4319167 -SHA512 (kernel-abi-whitelists-5.12.0-0.rc7.20210416git7e25f40eab52.191.tar.bz2) = 08fc395a43d23ab038e62d4bf5eb68b2461cc9e82d250b61191851411055b53635eec4f9b28ef057793506e963124d1c3d8ed37856777a765aa8aef2a3ef10d4 -SHA512 (kernel-kabi-dw-5.12.0-0.rc7.20210416git7e25f40eab52.191.tar.bz2) = c110d665124281a9dbffccaa55dae4a75242dbef32e63ba22a63cf1c5f495b0a1f97edf58595dcff6819b921a26a644c064bb41cffcee6dcce9674906a733a6c +SHA512 (linux-5.12-rc8.tar.xz) = 98d92bb596921c52b0ee76e069258d95321a3f6e809e6b44ae5af0761409acb095fd6276d86f679b32591dc458b58394e04e91c90d2ab7307805f5c27b121c7a +SHA512 (kernel-abi-whitelists-5.12.0-0.rc8.191.tar.bz2) = 67977d5ddc34b976936a7616cdd3349d9cc86a220773dbdcdc4de1adbe1aa9546b735c61840294552ca363c43f45fb7b9aeb2dfcf6cbea8c3623f38bab5b80b5 +SHA512 (kernel-kabi-dw-5.12.0-0.rc8.191.tar.bz2) = 4a70c3a15eef7f22f21cc185fa417bfaab15a5bd7a59ccd5c12753c092e46fef6521da75ababdb3ebbe41508294eb83d49823f246f2a70e13ef5425f1ebdc702 |