From: Greg Kroah-Hartman Date: Thu, 16 Jul 2026 05:10:38 +0000 (+0200) Subject: fix up queue-6.18/crypto-loongson-remove-broken-and-unused-loongson-rng.patch X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=060e4d229086dba7ca7dc489d2802c42da597903;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-6.18/crypto-loongson-remove-broken-and-unused-loongson-rng.patch --- diff --git a/queue-6.18/crypto-loongson-remove-broken-and-unused-loongson-rng.patch b/queue-6.18/crypto-loongson-remove-broken-and-unused-loongson-rng.patch index 39068360a6..3bc4ae44cb 100644 --- a/queue-6.18/crypto-loongson-remove-broken-and-unused-loongson-rng.patch +++ b/queue-6.18/crypto-loongson-remove-broken-and-unused-loongson-rng.patch @@ -33,24 +33,20 @@ Signed-off-by: Eric Biggers Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- - MAINTAINERS | 1 - - arch/loongarch/configs/loongson32_defconfig | 1 - - arch/loongarch/configs/loongson64_defconfig | 1 - - drivers/crypto/Kconfig | 1 - - drivers/crypto/Makefile | 1 - - drivers/crypto/loongson/Kconfig | 6 - - drivers/crypto/loongson/Makefile | 1 - - drivers/crypto/loongson/loongson-rng.c | 209 -------------------- - 8 files changed, 221 deletions(-) + MAINTAINERS | 1 + drivers/crypto/Kconfig | 1 + drivers/crypto/Makefile | 1 + drivers/crypto/loongson/Kconfig | 6 + drivers/crypto/loongson/Makefile | 1 + drivers/crypto/loongson/loongson-rng.c | 209 --------------------------------- + 6 files changed, 219 deletions(-) delete mode 100644 drivers/crypto/loongson/Kconfig delete mode 100644 drivers/crypto/loongson/Makefile delete mode 100644 drivers/crypto/loongson/loongson-rng.c -diff --git a/MAINTAINERS b/MAINTAINERS -index 882214b0e7db..6c805560c77c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -15070,7 +15070,6 @@ M: Qunqin Zhao +@@ -14617,7 +14617,6 @@ M: Qunqin Zhao L: linux-crypto@vger.kernel.org S: Maintained F: drivers/char/tpm/tpm_loongson.c @@ -58,35 +54,9 @@ index 882214b0e7db..6c805560c77c 100644 F: drivers/mfd/loongson-se.c F: include/linux/mfd/loongson-se.h -diff --git a/arch/loongarch/configs/loongson32_defconfig b/arch/loongarch/configs/loongson32_defconfig -index d5ef396dffe3..82897236863f 100644 ---- a/arch/loongarch/configs/loongson32_defconfig -+++ b/arch/loongarch/configs/loongson32_defconfig -@@ -1091,7 +1091,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m - CONFIG_CRYPTO_USER_API_RNG=m - CONFIG_CRYPTO_USER_API_AEAD=m - CONFIG_CRYPTO_DEV_VIRTIO=m --CONFIG_CRYPTO_DEV_LOONGSON_RNG=m - CONFIG_DMA_CMA=y - CONFIG_CMA_SIZE_MBYTES=0 - CONFIG_PRINTK_TIME=y -diff --git a/arch/loongarch/configs/loongson64_defconfig b/arch/loongarch/configs/loongson64_defconfig -index cba4cdff5acd..a94e88bd7ec5 100644 ---- a/arch/loongarch/configs/loongson64_defconfig -+++ b/arch/loongarch/configs/loongson64_defconfig -@@ -1124,7 +1124,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m - CONFIG_CRYPTO_USER_API_RNG=m - CONFIG_CRYPTO_USER_API_AEAD=m - CONFIG_CRYPTO_DEV_VIRTIO=m --CONFIG_CRYPTO_DEV_LOONGSON_RNG=m - CONFIG_DMA_CMA=y - CONFIG_DMA_NUMA_CMA=y - CONFIG_CMA_SIZE_MBYTES=0 -diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig -index 5dab813a9f74..223cb3c32261 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig -@@ -845,7 +845,6 @@ config CRYPTO_DEV_CCREE +@@ -852,7 +852,6 @@ config CRYPTO_DEV_CCREE If unsure say Y. source "drivers/crypto/hisilicon/Kconfig" @@ -94,11 +64,9 @@ index 5dab813a9f74..223cb3c32261 100644 source "drivers/crypto/amlogic/Kconfig" -diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile -index 283bbc650b5b..ad773158ae56 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile -@@ -43,7 +43,6 @@ obj-y += inside-secure/ +@@ -44,7 +44,6 @@ obj-y += inside-secure/ obj-$(CONFIG_CRYPTO_DEV_ARTPEC6) += axis/ obj-y += xilinx/ obj-y += hisilicon/ @@ -106,9 +74,6 @@ index 283bbc650b5b..ad773158ae56 100644 obj-$(CONFIG_CRYPTO_DEV_AMLOGIC_GXL) += amlogic/ obj-y += intel/ obj-y += starfive/ -diff --git a/drivers/crypto/loongson/Kconfig b/drivers/crypto/loongson/Kconfig -deleted file mode 100644 -index f4e1544ffbb4..000000000000 --- a/drivers/crypto/loongson/Kconfig +++ /dev/null @@ -1,6 +0,0 @@ @@ -118,16 +83,10 @@ index f4e1544ffbb4..000000000000 - select CRYPTO_RNG - help - Support for Loongson RNG Driver. -diff --git a/drivers/crypto/loongson/Makefile b/drivers/crypto/loongson/Makefile -deleted file mode 100644 -index 1ce5ec32b553..000000000000 --- a/drivers/crypto/loongson/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_CRYPTO_DEV_LOONGSON_RNG) += loongson-rng.o -diff --git a/drivers/crypto/loongson/loongson-rng.c b/drivers/crypto/loongson/loongson-rng.c -deleted file mode 100644 -index 3a4940260f9e..000000000000 --- a/drivers/crypto/loongson/loongson-rng.c +++ /dev/null @@ -1,209 +0,0 @@ @@ -340,6 +299,3 @@ index 3a4940260f9e..000000000000 -MODULE_AUTHOR("Yinggang Gu "); -MODULE_AUTHOR("Qunqin Zhao "); -MODULE_DESCRIPTION("Loongson Random Number Generator driver"); --- -2.55.0 -