summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-03-20 12:45:12 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-03-20 12:45:12 +0100
commitad05e5c5906b21c50532fa253f41604750519536 (patch)
tree6ac4203cce9fa82fd4e0f9d5485d11adc1022c94
parent121cdd55fe1d658ea2a9cad2ed8eb6ae22ed785d (diff)
parent43ba1a2c76f77c6f494d838cfc0451e5205c7dba (diff)
downloadkernel-ad05e5c5906b21c50532fa253f41604750519536.tar.gz
kernel-ad05e5c5906b21c50532fa253f41604750519536.tar.xz
kernel-ad05e5c5906b21c50532fa253f41604750519536.zip
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
-rwxr-xr-xkernel.spec3
-rw-r--r--redhatsecureboot003.cerbin829 -> 0 bytes
-rw-r--r--redhatsecureboot301.cerbin0 -> 899 bytes
-rw-r--r--redhatsecureboot401.cerbin978 -> 0 bytes
-rw-r--r--redhatsecureboot501.cerbin0 -> 964 bytes
-rw-r--r--redhatsecurebootca1.cerbin0 -> 977 bytes
-rw-r--r--redhatsecurebootca2.cerbin872 -> 0 bytes
-rw-r--r--redhatsecurebootca4.cerbin934 -> 0 bytes
-rw-r--r--redhatsecurebootca5.cerbin0 -> 920 bytes
-rw-r--r--secureboot_ppc.cerbin0 -> 899 bytes
-rw-r--r--secureboot_s390.cerbin0 -> 899 bytes
-rw-r--r--sources2
12 files changed, 4 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 6c0fcceb7..1e9a915e8 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -2772,6 +2772,9 @@ fi
#
#
%changelog
+* Wed Mar 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.7-100]
+- This is a released kernel branch (Justin M. Forbes)
+
* Wed Mar 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.7-9]
- Disable weak-modules again rhbz 1828455 (Justin M. Forbes)
- More config updates for gcc-plugin turn off (Justin M. Forbes)
diff --git a/redhatsecureboot003.cer b/redhatsecureboot003.cer
deleted file mode 100644
index 439b75bf3..000000000
--- a/redhatsecureboot003.cer
+++ /dev/null
Binary files differ
diff --git a/redhatsecureboot301.cer b/redhatsecureboot301.cer
new file mode 100644
index 000000000..20e660479
--- /dev/null
+++ b/redhatsecureboot301.cer
Binary files differ
diff --git a/redhatsecureboot401.cer b/redhatsecureboot401.cer
deleted file mode 100644
index 247666cfe..000000000
--- a/redhatsecureboot401.cer
+++ /dev/null
Binary files differ
diff --git a/redhatsecureboot501.cer b/redhatsecureboot501.cer
new file mode 100644
index 000000000..dfa7afb46
--- /dev/null
+++ b/redhatsecureboot501.cer
Binary files differ
diff --git a/redhatsecurebootca1.cer b/redhatsecurebootca1.cer
new file mode 100644
index 000000000..b2354007b
--- /dev/null
+++ b/redhatsecurebootca1.cer
Binary files differ
diff --git a/redhatsecurebootca2.cer b/redhatsecurebootca2.cer
deleted file mode 100644
index 43502d6bc..000000000
--- a/redhatsecurebootca2.cer
+++ /dev/null
Binary files differ
diff --git a/redhatsecurebootca4.cer b/redhatsecurebootca4.cer
deleted file mode 100644
index 8cb32e68c..000000000
--- a/redhatsecurebootca4.cer
+++ /dev/null
Binary files differ
diff --git a/redhatsecurebootca5.cer b/redhatsecurebootca5.cer
new file mode 100644
index 000000000..dfb028495
--- /dev/null
+++ b/redhatsecurebootca5.cer
Binary files differ
diff --git a/secureboot_ppc.cer b/secureboot_ppc.cer
new file mode 100644
index 000000000..2c0087dbc
--- /dev/null
+++ b/secureboot_ppc.cer
Binary files differ
diff --git a/secureboot_s390.cer b/secureboot_s390.cer
new file mode 100644
index 000000000..137d3858f
--- /dev/null
+++ b/secureboot_s390.cer
Binary files differ
diff --git a/sources b/sources
index 9dda5c2fa..bfaaff1d8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (linux-5.11.7.tar.xz) = b8ec332cab3b050f5a541cb41c653dd68315bb0b9654db1d4bbce051d49f0ad7e01ae81b8c0e3316d836464083acf5616bad9457e489e17f890e36431c43b2fc
-SHA512 (kernel-abi-whitelists-5.11.7-100.tar.bz2) = 4e2595b6a843b91916fa51e0a7efd40c0c0cdfa2c2faa7b6ce70471777aa5a437c755b0e1dd19561954eabad7740e17a99a75ac42e58a82f21a90617abdafe9d
+SHA512 (kernel-abi-whitelists-5.11.7-100.tar.bz2) = fdcd8defd2b521c973a123c0d6fdc8b12ab4f5d111fe3c390cd74e239ec5eb6d609fbc657423fd55bc0160c391fca25b7fd2377a26afedad121094478d0782a5
SHA512 (kernel-kabi-dw-5.11.7-100.tar.bz2) = 0f053d952de4f2f16854d0bee36487cf2deefa8bc7ec9f6c9105dd868d78a85a94252de00c9045e4573ed885ec2b91abdd3cf2df9f1485cf88af7a296412006a