ngompa/kernel-rpm
1
0
Fork 0
forked from rpms/kernel
Code Pull Requests Activity

kernel-5.17-0.rc0.20220118gitfe81ba137ebc.69

Browse Source 
* Tue Jan 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220118gitfe81ba137ebc.69]
- filter-modules.sh.rhel: Add ntc_thermistor to singlemods (Prarit Bhargava)
- lib/crypto: add prompts back to crypto libraries (Justin M. Forbes)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2022-01-18 11:51:45 -06:00
parent 2e962df600
commit dcddcf3387
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
29 changed files with 110 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 68
RHEL_RELEASE = 69
#
# Early y+1 numbering

4
Patchlist.changelog
View File

@ -1,5 +1,5 @@
https://gitlab.com/cki-project/kernel-ark/-/commit/caef74ae74c794692d32fa0c10a947152cf072ef
caef74ae74c794692d32fa0c10a947152cf072ef lib/crypto: add prompts back to crypto libraries
https://gitlab.com/cki-project/kernel-ark/-/commit/a39123f046ca62953518ecc7aa207ed281130d18
a39123f046ca62953518ecc7aa207ed281130d18 lib/crypto: add prompts back to crypto libraries
https://gitlab.com/cki-project/kernel-ark/-/commit/aa7ea266d2b6a3d865060945da1f8c674640e989
aa7ea266d2b6a3d865060945da1f8c674640e989 pci.h: Fix static include

2
filter-modules.sh.rhel
View File

@ -37,7 +37,7 @@ netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee80215
drmdrvs="amd ast gma500 i2c i915 mgag200 nouveau radeon via "
singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial ism regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus nct6775"
singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial ism regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus nct6775 ntc_thermistor"
# Grab the arch-specific filter list overrides
source ./filter-$2.sh

1
kernel-aarch64-debug-fedora.config
View File

@ -68,6 +68,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-aarch64-debug-rhel.config
View File

@ -49,6 +49,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-aarch64-fedora.config
View File

@ -68,6 +68,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-aarch64-rhel.config
View File

@ -49,6 +49,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-armv7hl-debug-fedora.config
View File

@ -63,6 +63,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-armv7hl-fedora.config
View File

@ -63,6 +63,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-armv7hl-lpae-debug-fedora.config
View File

@ -63,6 +63,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-armv7hl-lpae-fedora.config
View File

@ -63,6 +63,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-i686-debug-fedora.config
View File

@ -70,6 +70,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m

1
kernel-i686-fedora.config
View File

@ -70,6 +70,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m

1
kernel-ppc64le-debug-fedora.config
View File

@ -63,6 +63,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-ppc64le-debug-rhel.config
View File

@ -46,6 +46,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-ppc64le-fedora.config
View File

@ -63,6 +63,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-ppc64le-rhel.config
View File

@ -46,6 +46,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-s390x-debug-fedora.config
View File

@ -64,6 +64,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-s390x-debug-rhel.config
View File

@ -45,6 +45,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-s390x-fedora.config
View File

@ -64,6 +64,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-s390x-rhel.config
View File

@ -45,6 +45,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-s390x-zfcpdump-rhel.config
View File

@ -45,6 +45,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR=y

1
kernel-x86_64-debug-fedora.config
View File

@ -71,6 +71,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m

1
kernel-x86_64-debug-rhel.config
View File

@ -51,6 +51,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m

1
kernel-x86_64-fedora.config
View File

@ -71,6 +71,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m

1
kernel-x86_64-rhel.config
View File

@ -51,6 +51,7 @@ CONFIG_ACPI_NFIT=m
CONFIG_ACPI_NUMA=y
CONFIG_ACPI_PCC=y
CONFIG_ACPI_PCI_SLOT=y
# CONFIG_ACPI_PFRUT is not set
CONFIG_ACPI_PLATFORM_PROFILE=m
CONFIG_ACPI_PRMT=y
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m

21
kernel.spec
View File

@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
%global distro_build 0.rc0.20220117git0c947b893d69.68
%global distro_build 0.rc0.20220118gitfe81ba137ebc.69
%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.20220117git0c947b893d69.68
%define pkgrelease 0.rc0.20220118gitfe81ba137ebc.69
# This is needed to do merge window version magic
%define patchlevel 17
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc0.20220117git0c947b893d69.68%{?buildid}%{?dist}
%define specrelease 0.rc0.20220118gitfe81ba137ebc.69%{?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-10660-g0c947b893d69.tar.xz
Source0: linux-5.16-10996-gfe81ba137ebc.tar.xz
Source1: Makefile.rhelver
@ -1386,8 +1386,8 @@ ApplyOptionalPatch()
fi
}
%setup -q -n kernel-5.16-10660-g0c947b893d69 -c
mv linux-5.16-10660-g0c947b893d69 linux-%{KVERREL}
%setup -q -n kernel-5.16-10996-gfe81ba137ebc -c
mv linux-5.16-10996-gfe81ba137ebc linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@ -2984,12 +2984,13 @@ fi
#
#
%changelog
* Mon Jan 17 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17-0.rc0.20220117git0c947b893d69.68]
- Move CONFIG_SND_SOC_TLV320AIC31XX as it is now selected by CONFIG_SND_SOC_FSL_ASOC_CARD (Justin M. Forbes)
* Mon Jan 17 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220117git0c947b893d69.68]
* Tue Jan 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220118gitfe81ba137ebc.69]
- filter-modules.sh.rhel: Add ntc_thermistor to singlemods (Prarit Bhargava)
- lib/crypto: add prompts back to crypto libraries (Justin M. Forbes)
* Tue Jan 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220118gitfe81ba137ebc.68]
- Move CONFIG_SND_SOC_TLV320AIC31XX as it is now selected by CONFIG_SND_SOC_FSL_ASOC_CARD (Justin M. Forbes)
* Fri Jan 14 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220114gitfb3b0673b7d5.64]
- Add dev_addr_lists_test to mod-internal.list (Justin M. Forbes)

84
patch-5.17-redhat.patch
View File

@ -10,6 +10,7 @@
arch/s390/kernel/setup.c | 4 +
arch/x86/kernel/cpu/common.c | 1 +
arch/x86/kernel/setup.c | 70 ++++-
crypto/Kconfig | 2 -
crypto/rng.c | 73 ++++-
drivers/acpi/apei/hest.c | 8 +
drivers/acpi/irq.c | 17 +-
@ -65,7 +66,8 @@
kernel/panic.c | 14 +
kernel/rh_messages.c | 179 +++++++++++++
kernel/sysctl.c | 5 +
lib/crypto/Kconfig | 8 +-
lib/Kconfig | 2 +
lib/crypto/Kconfig | 17 +-
mm/cma.c | 10 +
scripts/mod/modpost.c | 8 +
scripts/tags.sh | 2 +
@ -73,7 +75,7 @@
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
75 files changed, 1516 insertions(+), 192 deletions(-)
77 files changed, 1526 insertions(+), 195 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index f5a27f067db9..f4dc42f2f82a 100644
@ -386,6 +388,16 @@ index f7a132eb794d..2305f8353e49 100644
unwind_init();
}
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 94bfa32cc6a1..442765219c37 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1928,5 +1928,3 @@ source "crypto/asymmetric_keys/Kconfig"
source "certs/Kconfig"
endif # if CRYPTO
-
-source "lib/crypto/Kconfig"
diff --git a/crypto/rng.c b/crypto/rng.c
index fea082b25fe4..50a9d040bed1 100644
--- a/crypto/rng.c
@ -546,7 +558,7 @@ index c68e694fca26..146cba5ae5bc 100644
return ctx.rc;
}
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index c215bc8723d0..f77dfdd124f1 100644
index 1331756d4cfc..4b5257f5e2c4 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1769,6 +1769,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
@ -566,7 +578,7 @@ index c215bc8723d0..f77dfdd124f1 100644
acpi_dev_get_resources(device, &resource_list,
acpi_check_serial_bus_slave,
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index f76b8418e6fb..350e52fccc30 100644
index 0ed484e04fd6..a2e486bd14ef 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -690,6 +690,24 @@ int ahci_stop_engine(struct ata_port *ap)
@ -2138,7 +2150,7 @@ index e8f37bdc8354..f57bbc8feeee 100644
if (xfs_has_discard(mp)) {
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 0de9fb1fdc5a..623207a0e74e 100644
index ccd4d3f91c98..e64643e3e364 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -43,6 +43,8 @@
@ -2150,7 +2162,7 @@ index 0de9fb1fdc5a..623207a0e74e 100644
typedef unsigned long efi_status_t;
typedef u8 efi_bool_t;
typedef u16 efi_char16_t; /* UNICODE character */
@@ -783,6 +785,14 @@ extern int __init efi_setup_pcdp_console(char *);
@@ -829,6 +831,14 @@ extern int __init efi_setup_pcdp_console(char *);
#define EFI_MEM_ATTR 10 /* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */
#define EFI_MEM_NO_SOFT_RESERVE 11 /* Is the kernel configured to ignore soft reservations? */
#define EFI_PRESERVE_BS_REGIONS 12 /* Are EFI boot-services memory segments available? */
@ -2165,7 +2177,7 @@ index 0de9fb1fdc5a..623207a0e74e 100644
#ifdef CONFIG_EFI
/*
@@ -794,6 +804,8 @@ static inline bool efi_enabled(int feature)
@@ -840,6 +850,8 @@ static inline bool efi_enabled(int feature)
}
extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);
@ -2174,7 +2186,7 @@ index 0de9fb1fdc5a..623207a0e74e 100644
bool __pure __efi_soft_reserve_enabled(void);
static inline bool __pure efi_soft_reserve_enabled(void)
@@ -814,6 +826,8 @@ static inline bool efi_enabled(int feature)
@@ -860,6 +872,8 @@ static inline bool efi_enabled(int feature)
static inline void
efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {}
@ -2183,7 +2195,7 @@ index 0de9fb1fdc5a..623207a0e74e 100644
static inline bool efi_soft_reserve_enabled(void)
{
return false;
@@ -826,6 +840,7 @@ static inline bool efi_rt_services_supported(unsigned int mask)
@@ -872,6 +886,7 @@ static inline bool efi_rt_services_supported(unsigned int mask)
#endif
extern int efi_status_to_err(efi_status_t status);
@ -2191,7 +2203,7 @@ index 0de9fb1fdc5a..623207a0e74e 100644
/*
* Variable Attributes
@@ -1078,13 +1093,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
@@ -1124,13 +1139,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
extern unsigned long efi_call_virt_save_flags(void);
@ -3023,20 +3035,51 @@ index ef77be575d87..977930662f33 100644
*(int *)table->data = unpriv_enable;
}
return ret;
diff --git a/lib/Kconfig b/lib/Kconfig
index 655b0e43f260..c20b68ad2bc3 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -122,6 +122,8 @@ config INDIRECT_IOMEM_FALLBACK
mmio accesses when the IO memory address is not a registered
emulated region.
+source "lib/crypto/Kconfig"
+
config CRC_CCITT
tristate "CRC-CCITT functions"
help
diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig
index 8620f38e117c..a3e41b7a8054 100644
index 8620f38e117c..e8e525650cf2 100644
--- a/lib/crypto/Kconfig
+++ b/lib/crypto/Kconfig
@@ -40,7 +40,7 @@ config CRYPTO_LIB_CHACHA_GENERIC
@@ -1,5 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
+menu "Crypto library routines"
+
config CRYPTO_LIB_AES
tristate
@@ -31,7 +33,7 @@ config CRYPTO_ARCH_HAVE_LIB_CHACHA
config CRYPTO_LIB_CHACHA_GENERIC
tristate
- select CRYPTO_ALGAPI
+ select XOR_BLOCKS
help
This symbol can be depended upon by arch implementations of the
ChaCha library interface that require the generic code as a
@@ -40,7 +42,8 @@ config CRYPTO_LIB_CHACHA_GENERIC
of CRYPTO_LIB_CHACHA.
config CRYPTO_LIB_CHACHA
- tristate
+ tristate "ChaCha library interface"
+ depends on CRYPTO
depends on CRYPTO_ARCH_HAVE_LIB_CHACHA || !CRYPTO_ARCH_HAVE_LIB_CHACHA
select CRYPTO_LIB_CHACHA_GENERIC if CRYPTO_ARCH_HAVE_LIB_CHACHA=n
help
@@ -65,7 +65,7 @@ config CRYPTO_LIB_CURVE25519_GENERIC
@@ -65,7 +68,7 @@ config CRYPTO_LIB_CURVE25519_GENERIC
of CRYPTO_LIB_CURVE25519.
config CRYPTO_LIB_CURVE25519
@ -3045,7 +3088,7 @@ index 8620f38e117c..a3e41b7a8054 100644
depends on CRYPTO_ARCH_HAVE_LIB_CURVE25519 || !CRYPTO_ARCH_HAVE_LIB_CURVE25519
select CRYPTO_LIB_CURVE25519_GENERIC if CRYPTO_ARCH_HAVE_LIB_CURVE25519=n
help
@@ -100,7 +100,7 @@ config CRYPTO_LIB_POLY1305_GENERIC
@@ -100,7 +103,7 @@ config CRYPTO_LIB_POLY1305_GENERIC
of CRYPTO_LIB_POLY1305.
config CRYPTO_LIB_POLY1305
@ -3054,7 +3097,7 @@ index 8620f38e117c..a3e41b7a8054 100644
depends on CRYPTO_ARCH_HAVE_LIB_POLY1305 || !CRYPTO_ARCH_HAVE_LIB_POLY1305
select CRYPTO_LIB_POLY1305_GENERIC if CRYPTO_ARCH_HAVE_LIB_POLY1305=n
help
@@ -109,7 +109,7 @@ config CRYPTO_LIB_POLY1305
@@ -109,14 +112,18 @@ config CRYPTO_LIB_POLY1305
is available and enabled.
config CRYPTO_LIB_CHACHA20POLY1305
@ -3062,7 +3105,18 @@ index 8620f38e117c..a3e41b7a8054 100644
+ tristate "ChaCha20-Poly1305 AEAD support (8-byte nonce library version)"
depends on CRYPTO_ARCH_HAVE_LIB_CHACHA || !CRYPTO_ARCH_HAVE_LIB_CHACHA
depends on CRYPTO_ARCH_HAVE_LIB_POLY1305 || !CRYPTO_ARCH_HAVE_LIB_POLY1305
+ depends on CRYPTO
select CRYPTO_LIB_CHACHA
select CRYPTO_LIB_POLY1305
+ select CRYPTO_ALGAPI
config CRYPTO_LIB_SHA256
tristate
config CRYPTO_LIB_SM4
tristate
+
+endmenu
diff --git a/mm/cma.c b/mm/cma.c
index bc9ca8f3c487..9fa9a485eb3a 100644
--- a/mm/cma.c

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-5.16-10660-g0c947b893d69.tar.xz) = 18fdb74965c6cd5635fb094a5ed775bc186deda702a032a5c96b5cce850b0807f6893d1572499bbacfbb4571369c06cadadc77975bd10858316e2655dad37ec5
SHA512 (kernel-abi-stablelists-5.17.0-0.rc0.20220117git0c947b893d69.68.tar.bz2) = 0d95d14ce302290688fa2f31555cc2555ad24a5fc235362fc26665ad56b3694fd39d834bc7a9549b423fa8da791bcec68ea20b7d858a1541c1224231a646464d
SHA512 (kernel-kabi-dw-5.17.0-0.rc0.20220117git0c947b893d69.68.tar.bz2) = 24cff7c11ee3086994886e636eb2f3ffa40c42477d2a5500e8863d2bc71c0d92ab8ae3d3be8d87a665ffb90543cd181e3da1ab719ede002cc804ac295f28863d
SHA512 (linux-5.16-10996-gfe81ba137ebc.tar.xz) = 85b8600ab052ea8476540a000f31babd3eda9cb169ca3f7a14b84be2435cc08bf017f98b774583970a3930e837fe5c1ad524ab58939d8436d3de9f6fd293a271
SHA512 (kernel-abi-stablelists-5.17.0-0.rc0.20220118gitfe81ba137ebc.69.tar.bz2) = c67db70785b9ae215ac5b15928da303139d296410f8d4ee51bbbf5ba9da22dec97070fb583f3b2f52ac6ebceb38385d2f1e95cf2285e15461fae971282005e1a
SHA512 (kernel-kabi-dw-5.17.0-0.rc0.20220118gitfe81ba137ebc.69.tar.bz2) = 4811049aec6d2ccf5bbba16ba20d0b5838642cc7de5bef3e2852ae9c5c3af259bc888d67f7d0029152d4ca8d7ce8d78101995f49577d0ca0c791fb0ab9673589