diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-24 12:29:39 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-24 12:29:39 +0100 |
commit | 4c37745b4fb15c6d84015067755c7bce74cc0e87 (patch) | |
tree | 9763a1b10c94d5d73373a85dac3aa5234be6f131 | |
parent | 29b797e02dc28c3ac07e592a8cf33b6c6b6ea270 (diff) | |
parent | 1bcc41b31f04aa965211c8518354371632c614e9 (diff) | |
download | kernel-4c37745b4fb15c6d84015067755c7bce74cc0e87.tar.gz kernel-4c37745b4fb15c6d84015067755c7bce74cc0e87.tar.xz kernel-4c37745b4fb15c6d84015067755c7bce74cc0e87.zip |
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
-rw-r--r-- | Makefile.rhelver | 2 | ||||
-rwxr-xr-x | kernel.spec | 2 | ||||
-rw-r--r-- | patch-5.11-redhat.patch | 2 | ||||
-rw-r--r-- | sources | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index f74bfc4ea..a5081aa8d 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 = 9 +RHEL_RELEASE = 10 # # Early y+1 numbering diff --git a/kernel.spec b/kernel.spec index ee664b241..90b0a5f64 100755 --- a/kernel.spec +++ b/kernel.spec @@ -2771,7 +2771,7 @@ fi # # %changelog -* Wed Mar 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.7-100] +* Sun Mar 21 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.8-10] - This is a released kernel branch (Justin M. Forbes) * Wed Mar 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.7-9] diff --git a/patch-5.11-redhat.patch b/patch-5.11-redhat.patch index d5ebaa20f..47a381e02 100644 --- a/patch-5.11-redhat.patch +++ b/patch-5.11-redhat.patch @@ -273,7 +273,7 @@ index 000000000000..c33a71263d9e + 2. Add the new profile name, along with a clear description of the + expected behaviour, to the sysfs-platform_profile ABI documentation. diff --git a/Makefile b/Makefile -index 6ba32b82c480..20d2cb6a8bad 100644 +index d8a39ece170d..1b98067c8aa8 100644 --- a/Makefile +++ b/Makefile @@ -494,6 +494,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -1,3 +1,3 @@ -SHA512 (linux-5.11.7.tar.xz) = b8ec332cab3b050f5a541cb41c653dd68315bb0b9654db1d4bbce051d49f0ad7e01ae81b8c0e3316d836464083acf5616bad9457e489e17f890e36431c43b2fc -SHA512 (kernel-abi-whitelists-5.11.7-100.tar.bz2) = fdcd8defd2b521c973a123c0d6fdc8b12ab4f5d111fe3c390cd74e239ec5eb6d609fbc657423fd55bc0160c391fca25b7fd2377a26afedad121094478d0782a5 -SHA512 (kernel-kabi-dw-5.11.7-100.tar.bz2) = 0f053d952de4f2f16854d0bee36487cf2deefa8bc7ec9f6c9105dd868d78a85a94252de00c9045e4573ed885ec2b91abdd3cf2df9f1485cf88af7a296412006a +SHA512 (linux-5.11.8.tar.xz) = e6e6f28df18e52b7c318b250e2a02ba01b58de7ccaa8f975ab8d5fdd02772f5c6482bcd9bc864565dc28f602c8d922837ffe98271ebb28f3c4cf16a6c847c88c +SHA512 (kernel-abi-whitelists-5.11.8-100.tar.bz2) = 648fc348c1f479e690a53c7249c793c24fa47061aa991bdd2cc066530c803a54af30032c5f2d32064d5e002bbb9be3fb038fe00bd4c7a4428b16e68f8780cb8c +SHA512 (kernel-kabi-dw-5.11.8-100.tar.bz2) = 5bf9000d54f6066577569d6dae49ae592e01819c67eab2840408ab17949410111a3dd7f142279e0d86ac74d23041eb9bc9c184c733d1b22b68e86f6eb6555de5 |