From 99f01811cec01dfb86a107a6a4134836b476c554 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 14 Jan 2022 11:47:18 -0600 Subject: kernel-5.17-0.rc0.20220114gitfb3b0673b7d5.65 * Fri Jan 14 2022 Fedora Kernel Team [5.17-0.rc0.20220114gitfb3b0673b7d5.65] - lib/crypto: add prompts back to crypto libraries (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel.spec | 18 ++++++++++-------- patch-5.17-redhat.patch | 8 ++++---- sources | 6 +++--- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index e225efe92..c437acaf5 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 = 64 +RHEL_RELEASE = 65 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index bb94a9656..671f4bfac 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/a5366668e0493110e1cd0b4a615c0f9dc8b47256 - a5366668e0493110e1cd0b4a615c0f9dc8b47256 lib/crypto: add prompts back to crypto libraries +https://gitlab.com/cki-project/kernel-ark/-/commit/98ff1cc632bd345aff99bc938af3b3734d91745a + 98ff1cc632bd345aff99bc938af3b3734d91745a lib/crypto: add prompts back to crypto libraries https://gitlab.com/cki-project/kernel-ark/-/commit/aa7ea266d2b6a3d865060945da1f8c674640e989 aa7ea266d2b6a3d865060945da1f8c674640e989 pci.h: Fix static include diff --git a/kernel.spec b/kernel.spec index 86212d82a..b84c0385f 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc0.20220113git455e73a07f6e.64 +%global distro_build 0.rc0.20220114gitfb3b0673b7d5.65 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.17.0 %define patchversion 5.17 -%define pkgrelease 0.rc0.20220113git455e73a07f6e.64 +%define pkgrelease 0.rc0.20220114gitfb3b0673b7d5.65 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20220113git455e73a07f6e.64%{?buildid}%{?dist} +%define specrelease 0.rc0.20220114gitfb3b0673b7d5.65%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -692,7 +692,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-8050-g455e73a07f6e.tar.xz +Source0: linux-5.16-8301-gfb3b0673b7d5.tar.xz Source1: Makefile.rhelver @@ -1386,8 +1386,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-8050-g455e73a07f6e -c -mv linux-5.16-8050-g455e73a07f6e linux-%{KVERREL} +%setup -q -n kernel-5.16-8301-gfb3b0673b7d5 -c +mv linux-5.16-8301-gfb3b0673b7d5 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2984,10 +2984,12 @@ fi # # %changelog -* Thu Jan 13 2022 Fedora Kernel Team [5.17-0.rc0.20220113git455e73a07f6e.64] -- Add dev_addr_lists_test to mod-internal.list (Justin M. Forbes) +* Fri Jan 14 2022 Fedora Kernel Team [5.17-0.rc0.20220114gitfb3b0673b7d5.65] - lib/crypto: add prompts back to crypto libraries (Justin M. Forbes) +* Fri Jan 14 2022 Fedora Kernel Team [5.17-0.rc0.20220114gitfb3b0673b7d5.64] +- Add dev_addr_lists_test to mod-internal.list (Justin M. Forbes) + * Thu Jan 13 2022 Fedora Kernel Team [5.17-0.rc0.20220113git455e73a07f6e.63] - configs/fedora: Enable CONFIG_NFC_PN532_UART for use PN532 NFC module (Ziqian SUN (Zamir)) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index 8ff97ee7e..7089d2278 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -76,7 +76,7 @@ 75 files changed, 1516 insertions(+), 192 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 685645e75706..62672720fd12 100644 +index 4955d2faf4cc..d67538c87631 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -5992,6 +5992,15 @@ @@ -1963,7 +1963,7 @@ index 6a90e6e53d09..7e48c3bf701d 100644 PCI_ANY_ID, PCI_ANY_ID, }, {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC, diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c -index aeb95f409826..68a999b02009 100644 +index 82e1e24257bc..d256b02a5d2f 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -149,6 +149,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance); @@ -2306,10 +2306,10 @@ index f5844908a089..901d51012738 100644 struct taint_flag { diff --git a/include/linux/pci.h b/include/linux/pci.h -index 18a75c8e615c..8cc24460267e 100644 +index 0a7b6b2f163b..5ba560df0537 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1478,6 +1478,22 @@ int pci_add_dynid(struct pci_driver *drv, +@@ -1480,6 +1480,22 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data); const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); diff --git a/sources b/sources index 999abd20c..2f4fef408 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.16-8050-g455e73a07f6e.tar.xz) = c1960eefe62bf8bdafbd22251b986faa81095ad3956fa6386f489889ca2ad746e4823139bf46b7033b5c410a8275f785b46c477fd48081e43046d7c48ee296d7 -SHA512 (kernel-abi-stablelists-5.17.0-0.rc0.20220113git455e73a07f6e.64.tar.bz2) = 0ce27e2fac261fce7025a5fd16bbf49bc4b35fd69028a8d6463b029baed1d0ad90f7aca097cf5e19da9ad9d335c426c5d758bffde7e246bb72ce5bc4ab774d94 -SHA512 (kernel-kabi-dw-5.17.0-0.rc0.20220113git455e73a07f6e.64.tar.bz2) = 89824b8ba593133c1a3ab59e28553c6f89ea131a157f9fe176d379c3e1b5956bd60db54f5b5bc08d9903399ccf6bbe9d1482f4c63aafa4ed6cab407c8d731fc8 +SHA512 (linux-5.16-8301-gfb3b0673b7d5.tar.xz) = e970304a0378e7756d9b4956f519b87ad7fb44f2d8320f19ac5ae3afb5c32360ca476f6eb342c9c91829e527582cb844b79cd889dd10542551b69154e3642b16 +SHA512 (kernel-abi-stablelists-5.17.0-0.rc0.20220114gitfb3b0673b7d5.65.tar.bz2) = 34e1bfaeed8a2c7a7dd5dc729bf95e211cd044cd6fbb474ee075307f2ca13d1122fcaffb6d0589b5e42078cbf0f42680b7b5390319db67d4fc38908c07637f34 +SHA512 (kernel-kabi-dw-5.17.0-0.rc0.20220114gitfb3b0673b7d5.65.tar.bz2) = a022bd616c957d9422bc39e559c26c7f3bb820961b018e6c08495522f690bf3b185a3aeffa8e25840725a0895ca1836a992e53b4d9fd4fd264f8865a636a9f57 -- cgit