summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2024-01-04 18:04:58 -0800
committerJakub Kicinski <kuba@kernel.org>2024-01-04 18:06:46 -0800
commite63c1822ac32a865dd02a18107fc933fd7b30f6f (patch)
tree3d3875012e8412080a5ecc5f71d8f7e849bd4a95 /arch/s390
parenta180b0b1a6c484a091f2f20f9c6b9e5e726cbd31 (diff)
parent1f874787ed9a2d78ed59cb21d0d90ac0178eceb0 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/broadcom/bnxt/bnxt.c e009b2efb7a8 ("bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters()") 0f2b21477988 ("bnxt_en: Fix compile error without CONFIG_RFS_ACCEL") https://lore.kernel.org/all/20240105115509.225aa8a2@canb.auug.org.au/ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 3bec98d20283..d5d8f99d1f25 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -254,13 +254,13 @@ config ARCH_SUPPORTS_KEXEC
def_bool y
config ARCH_SUPPORTS_KEXEC_FILE
- def_bool CRYPTO && CRYPTO_SHA256 && CRYPTO_SHA256_S390
+ def_bool y
config ARCH_SUPPORTS_KEXEC_SIG
def_bool MODULE_SIG_FORMAT
config ARCH_SUPPORTS_KEXEC_PURGATORY
- def_bool KEXEC_FILE
+ def_bool y
config ARCH_SUPPORTS_CRASH_DUMP
def_bool y