diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-24 12:29:28 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-24 12:29:28 +0100 |
| commit | 90c674dfed77db6270557974c470abbc9d42f3c0 (patch) | |
| tree | 0d607051134d767b7edb75dc532e38f2ea022979 | |
| parent | 79c3c41a75459cc5af87b432d13257b3d2f2024a (diff) | |
| parent | 276de988357c14e6f7adc78dfd0756bbc24aaf38 (diff) | |
| download | kernel-90c674dfed77db6270557974c470abbc9d42f3c0.tar.gz kernel-90c674dfed77db6270557974c470abbc9d42f3c0.tar.xz kernel-90c674dfed77db6270557974c470abbc9d42f3c0.zip | |
Merge remote-tracking branch 'origin/f34' into f34-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 4e19764a9..47ad62429 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-300] +* 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-300.tar.bz2) = f2e01eea16f520b433fa30d368588a7232913602c11a8e341172012c33d426a080f09adcbe13717ee5a4fb552a392399135f540131b2ce97d3e8d9954c19eac3 -SHA512 (kernel-kabi-dw-5.11.7-300.tar.bz2) = 0f053d952de4f2f16854d0bee36487cf2deefa8bc7ec9f6c9105dd868d78a85a94252de00c9045e4573ed885ec2b91abdd3cf2df9f1485cf88af7a296412006a +SHA512 (linux-5.11.8.tar.xz) = e6e6f28df18e52b7c318b250e2a02ba01b58de7ccaa8f975ab8d5fdd02772f5c6482bcd9bc864565dc28f602c8d922837ffe98271ebb28f3c4cf16a6c847c88c +SHA512 (kernel-abi-whitelists-5.11.8-300.tar.bz2) = a086d2ec5c570a0c79833bf38bc59c46b159dec35be672880a9d66e9f9855f0524e1b08c066302f800b865ab9abe4334637e968224d1034c7f6fe284b0285dc3 +SHA512 (kernel-kabi-dw-5.11.8-300.tar.bz2) = 5bf9000d54f6066577569d6dae49ae592e01819c67eab2840408ab17949410111a3dd7f142279e0d86ac74d23041eb9bc9c184c733d1b22b68e86f6eb6555de5 |