aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/config-5.151
-rw-r--r--target/linux/generic/hack-5.15/261-lib-arc4-unhide.patch4
-rw-r--r--target/linux/generic/pending-5.15/205-backtrace_module_info.patch4
3 files changed, 4 insertions, 5 deletions
diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index 8146161d08..3ddc7fbbf8 100644
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -1177,7 +1177,6 @@ CONFIG_CRYPTO_KPP=y
CONFIG_CRYPTO_KPP2=y
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=y
-# CONFIG_CRYPTO_LIB_BLAKE2S is not set
# CONFIG_CRYPTO_LIB_CHACHA is not set
# CONFIG_CRYPTO_LIB_CHACHA20POLY1305 is not set
# CONFIG_CRYPTO_LIB_CURVE25519 is not set
diff --git a/target/linux/generic/hack-5.15/261-lib-arc4-unhide.patch b/target/linux/generic/hack-5.15/261-lib-arc4-unhide.patch
index a7668acfad..dfba811f31 100644
--- a/target/linux/generic/hack-5.15/261-lib-arc4-unhide.patch
+++ b/target/linux/generic/hack-5.15/261-lib-arc4-unhide.patch
@@ -4,7 +4,7 @@ from backports.
--- a/lib/crypto/Kconfig
+++ b/lib/crypto/Kconfig
-@@ -6,7 +6,7 @@ config CRYPTO_LIB_AES
+@@ -4,7 +4,7 @@ config CRYPTO_LIB_AES
tristate
config CRYPTO_LIB_ARC4
@@ -12,4 +12,4 @@ from backports.
+ tristate "ARC4 cipher library"
config CRYPTO_ARCH_HAVE_LIB_BLAKE2S
- tristate
+ bool
diff --git a/target/linux/generic/pending-5.15/205-backtrace_module_info.patch b/target/linux/generic/pending-5.15/205-backtrace_module_info.patch
index 84e4534143..6379ce071d 100644
--- a/target/linux/generic/pending-5.15/205-backtrace_module_info.patch
+++ b/target/linux/generic/pending-5.15/205-backtrace_module_info.patch
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
-@@ -1001,8 +1001,10 @@ char *symbol_string(char *buf, char *end
+@@ -1003,8 +1003,10 @@ char *symbol_string(char *buf, char *end
struct printf_spec spec, const char *fmt)
{
unsigned long value;
@@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif
if (fmt[1] == 'R')
-@@ -1023,8 +1025,14 @@ char *symbol_string(char *buf, char *end
+@@ -1025,8 +1027,14 @@ char *symbol_string(char *buf, char *end
return string_nocheck(buf, end, sym, spec);
#else